zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-24 21:21:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/rheit/zdoom

Browse source
This commit is contained in:
Christoph Oelckers 2015-04-15 09:45:09 +02:00
commit 5d819036b3
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gameconfigfile.cpp
View file

@ -429,7 +429,7 @@ void FGameConfigFile::DoKeySetup(const char *gamename)
{ "Bindings", &Bindings }, { "Bindings", &Bindings },
{ "DoubleBindings", &DoubleBindings }, { "DoubleBindings", &DoubleBindings },
{ "AutomapBindings", &AutomapBindings }, { "AutomapBindings", &AutomapBindings },
NULL, NULL { NULL, NULL }
}; };
const char *key, *value; const char *key, *value;

10
src/p_user.cpp
View file

@ -295,23 +295,23 @@ player_t::player_t()
respawn_time(0), respawn_time(0),
camera(0), camera(0),
air_finished(0), air_finished(0),
MUSINFOactor(0),
MUSINFOtics(-1),
crouching(0),
crouchdir(0),
Bot(0), Bot(0),
BlendR(0), BlendR(0),
BlendG(0), BlendG(0),
BlendB(0), BlendB(0),
BlendA(0), BlendA(0),
LogText(), LogText(),
crouching(0),
crouchdir(0),
crouchfactor(0), crouchfactor(0),
crouchoffset(0), crouchoffset(0),
crouchviewdelta(0), crouchviewdelta(0),
ConversationNPC(0), ConversationNPC(0),
ConversationPC(0), ConversationPC(0),
ConversationNPCAngle(0), ConversationNPCAngle(0),
ConversationFaceTalker(0), ConversationFaceTalker(0)
MUSINFOactor(0),
MUSINFOtics(-1)
{ {
memset (&cmd, 0, sizeof(cmd)); memset (&cmd, 0, sizeof(cmd));
memset (frags, 0, sizeof(frags)); memset (frags, 0, sizeof(frags));

2
src/w_wad.cpp
View file

@ -317,7 +317,7 @@ void FWadCollection::AddFile (const char *filename, FileReader *wadinfo)
sprintf(cksumout + (j * 2), "%02X", cksum[j]); sprintf(cksumout + (j * 2), "%02X", cksum[j]);
} }
fprintf(hashfile, "file: %s, hash: %s, size: %d\n", filename, cksumout, reader->GetLength()); fprintf(hashfile, "file: %s, hash: %s, size: %ld\n", filename, cksumout, reader->GetLength());
} }
else else