games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

* compilation fix under VC++

Browse Source 
* fix for a bug that prevented from loading a map (convertHordes cannot be called before town field is set)
* normalized line endings in CBitmapHandler.cpp
This commit is contained in:
mateuszb
2010-01-28 13:56:48 +00:00
parent 7c9f0eb19f
commit 1708894790
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/CBitmapHandler.cpp
View File

@@ -158,7 +158,7 @@ SDL_Surface * BitmapHandler::loadBitmap(std::string fname, bool setKey)
return NULL; return NULL;
} }
if(e->offset<0) if(e->offset<0)
{ {
fname = e->realName; fname = e->realName;
fname = DATA_DIR "/Data/" + fname; fname = DATA_DIR "/Data/" + fname;
FILE * f = fopen(fname.c_str(),"r"); FILE * f = fopen(fname.c_str(),"r");

2
lib/CGameState.cpp
View File

@@ -1168,7 +1168,7 @@ void CGameState::randomizeObject(CGObjectInstance *cur)
t->defInfo = forts[t->subID]; t->defInfo = forts[t->subID];
else else
t->defInfo = villages[t->subID]; t->defInfo = villages[t->subID];
convertHordes(t); //convertHordes(t);
} }
return; return;
} }