Merge remote-tracking branch 'origin/master' into foldermove2

Conflicts: GNUmakefile
2013-11-24 14:37:03 +00:00
parent 4e463d591d dbb76ef9fe
commit c3cd436ec3
131 changed files with 6157 additions and 3632 deletions
@@ -22,9 +22,9 @@ class cWindow;
 class cInventory;
 class cPawn;
 class cPickup;
+class cWorld;
 class cMonster;
 class cChunkDataSerializer;
-class cWorld;
 class cFallingBlock;


@@ -85,6 +85,7 @@ public:
 	virtual void SendPlayerPosition      (void) = 0;
 	virtual void SendPlayerSpawn         (const cPlayer & a_Player) = 0;
 	virtual void SendRespawn             (void) = 0;
+	virtual void SendExperience          (void) = 0;
 	virtual void SendSoundEffect         (const AString & a_SoundName, int a_SrcX, int a_SrcY, int a_SrcZ, float a_Volume, float a_Pitch) = 0;  // a_Src coords are Block * 8
 	virtual void SendSoundParticleEffect (int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data) = 0;
 	virtual void SendSpawnFallingBlock   (const cFallingBlock & a_FallingBlock) = 0;