[Scummvm-cvs-logs] SF.net SVN: scummvm: [32916] residual/trunk/engine
aquadran at users.sourceforge.net
aquadran at users.sourceforge.net
Sat Jul 5 16:55:09 CEST 2008
Revision: 32916
http://scummvm.svn.sourceforge.net/scummvm/?rev=32916&view=rev
Author: aquadran
Date: 2008-07-05 07:55:09 -0700 (Sat, 05 Jul 2008)
Log Message:
-----------
applied patch #1996204
Modified Paths:
--------------
residual/trunk/engine/imuse/imuse_track.cpp
residual/trunk/engine/lua/lundump.cpp
residual/trunk/engine/savegame.cpp
Modified: residual/trunk/engine/imuse/imuse_track.cpp
===================================================================
--- residual/trunk/engine/imuse/imuse_track.cpp 2008-07-05 10:30:24 UTC (rev 32915)
+++ residual/trunk/engine/imuse/imuse_track.cpp 2008-07-05 14:55:09 UTC (rev 32916)
@@ -308,7 +308,7 @@
return track->pan / 1000;
}
}
- return NULL;
+ return 0;
}
int Imuse::getCurMusicVol() {
@@ -319,7 +319,7 @@
return track->vol / 1000;
}
}
- return NULL;
+ return 0;
}
void Imuse::fadeOutMusic(int duration) {
Modified: residual/trunk/engine/lua/lundump.cpp
===================================================================
--- residual/trunk/engine/lua/lundump.cpp 2008-07-05 10:30:24 UTC (rev 32915)
+++ residual/trunk/engine/lua/lundump.cpp 2008-07-05 14:55:09 UTC (rev 32916)
@@ -122,21 +122,21 @@
ttype(o)=(lua_Type)-ezgetc(Z);
switch ((unsigned)ttype(o))
{
- case -'N':
+ case (unsigned int)-'N':
ttype(o)=LUA_T_NUMBER;
- case LUA_T_NUMBER:
+ case (unsigned int)LUA_T_NUMBER:
doLoadNumber(nvalue(o),Z);
break;
- case -'S':
+ case (unsigned int)-'S':
ttype(o)=LUA_T_STRING;
- case LUA_T_STRING:
+ case (unsigned int)LUA_T_STRING:
tsvalue(o)=LoadTString(Z);
break;
- case -'F':
+ case (unsigned int)-'F':
ttype(o)=LUA_T_PROTO;
- case LUA_T_PROTO:
+ case (unsigned int)LUA_T_PROTO:
break;
- case LUA_T_NIL:
+ case (unsigned int)LUA_T_NIL:
break;
default:
luaL_verror("bad constant #%d in %s: type=%d [%s]",
Modified: residual/trunk/engine/savegame.cpp
===================================================================
--- residual/trunk/engine/savegame.cpp 2008-07-05 10:30:24 UTC (rev 32915)
+++ residual/trunk/engine/savegame.cpp 2008-07-05 14:55:09 UTC (rev 32916)
@@ -98,7 +98,7 @@
gzwrite(_fileHandle, _sectionBuffer, _sectionSize);
}
delete[] _sectionBuffer;
- _currentSection = NULL;
+ _sectionBuffer = NULL;
}
void SaveGame::read(void *data, int size) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list