mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-28 04:37:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge commit 'origin/master' into 320

Browse source 
Conflicts:
	src/game/Player.cpp
	src/game/Totem.cpp
This commit is contained in:
tomrus88 2009-07-21 08:22:30 +04:00
commit 4c709772c1
61 changed files with 912 additions and 454 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "8192"
#define REVISION_NR "8225"
#endif // __REVISION_NR_H__

2
src/shared/vmap/TileAssembler.cpp
View file

@ -241,7 +241,7 @@ namespace VMAP
char destnamebuffer[500];
char fullnamedestnamebuffer[500];
if(nameCollection.iMainFiles.size() >0)
{
sprintf(destnamebuffer,"%03u_%i_%i.vmap",pMapId, pYPos, pXPos); // flip it here too