[Scummvm-cvs-logs] SF.net SVN: scummvm:[33314] residual/trunk/engine
aquadran at users.sourceforge.net
aquadran at users.sourceforge.net
Sat Jul 26 21:24:28 CEST 2008
Revision: 33314
http://scummvm.svn.sourceforge.net/scummvm/?rev=33314&view=rev
Author: aquadran
Date: 2008-07-26 19:24:27 +0000 (Sat, 26 Jul 2008)
Log Message:
-----------
fix warnings
Modified Paths:
--------------
residual/trunk/engine/lua.cpp
residual/trunk/engine/tinygl/get.cpp
residual/trunk/engine/tinygl/init.cpp
residual/trunk/engine/tinygl/light.cpp
residual/trunk/engine/tinygl/misc.cpp
residual/trunk/engine/tinygl/zgl.h
Modified: residual/trunk/engine/lua.cpp
===================================================================
--- residual/trunk/engine/lua.cpp 2008-07-26 19:11:23 UTC (rev 33313)
+++ residual/trunk/engine/lua.cpp 2008-07-26 19:24:27 UTC (rev 33314)
@@ -2152,7 +2152,6 @@
static void luaFileFindFirst() {
const char *path, *extension;
- char tmpPath[MAXPATHLEN];
lua_Object pathObj;
DEBUG_FUNCTION();
@@ -2164,6 +2163,7 @@
path = "";
#ifdef DEFAULT_SAVE_PATH
#if defined(UNIX)
+ char tmpPath[MAXPATHLEN];
const char *home = getenv("HOME");
if (home && *home && strlen(home) < MAXPATHLEN) {
snprintf(tmpPath, MAXPATHLEN, "%s/%s", home, DEFAULT_SAVE_PATH);
Modified: residual/trunk/engine/tinygl/get.cpp
===================================================================
--- residual/trunk/engine/tinygl/get.cpp 2008-07-26 19:11:23 UTC (rev 33313)
+++ residual/trunk/engine/tinygl/get.cpp 2008-07-26 19:24:27 UTC (rev 33314)
@@ -18,7 +18,7 @@
*params = MAX_PROJECTION_STACK_DEPTH;
break;
case TGL_MAX_LIGHTS:
- *params = MAX_LIGHTS;
+ *params = T_MAX_LIGHTS;
break;
case TGL_MAX_TEXTURE_SIZE:
*params = 256; /* not completely true, but... */
Modified: residual/trunk/engine/tinygl/init.cpp
===================================================================
--- residual/trunk/engine/tinygl/init.cpp 2008-07-26 19:11:23 UTC (rev 33313)
+++ residual/trunk/engine/tinygl/init.cpp 2008-07-26 19:24:27 UTC (rev 33314)
@@ -58,7 +58,7 @@
c->in_begin=0;
// lights
- for (i = 0; i < MAX_LIGHTS; i++) {
+ for (i = 0; i < T_MAX_LIGHTS; i++) {
GLLight *l = &c->lights[i];
l->ambient = gl_V4_New(0, 0, 0, 1);
l->diffuse = gl_V4_New(1, 1, 1, 1);
Modified: residual/trunk/engine/tinygl/light.cpp
===================================================================
--- residual/trunk/engine/tinygl/light.cpp 2008-07-26 19:11:23 UTC (rev 33313)
+++ residual/trunk/engine/tinygl/light.cpp 2008-07-26 19:24:27 UTC (rev 33314)
@@ -66,7 +66,7 @@
GLLight *l;
int i;
- assert(light >= TGL_LIGHT0 && light < TGL_LIGHT0+MAX_LIGHTS );
+ assert(light >= TGL_LIGHT0 && light < TGL_LIGHT0+T_MAX_LIGHTS );
l = &c->lights[light - TGL_LIGHT0];
Modified: residual/trunk/engine/tinygl/misc.cpp
===================================================================
--- residual/trunk/engine/tinygl/misc.cpp 2008-07-26 19:11:23 UTC (rev 33313)
+++ residual/trunk/engine/tinygl/misc.cpp 2008-07-26 19:24:27 UTC (rev 33314)
@@ -95,7 +95,7 @@
c->shadow_mode &= ~2;
break;
default:
- if (code>=TGL_LIGHT0 && code<TGL_LIGHT0+MAX_LIGHTS) {
+ if (code>=TGL_LIGHT0 && code<TGL_LIGHT0+T_MAX_LIGHTS) {
gl_enable_disable_light(c,code - TGL_LIGHT0, v);
} else {
//fprintf(stderr, "glEnableDisable: 0x%X not supported.\n", code);
Modified: residual/trunk/engine/tinygl/zgl.h
===================================================================
--- residual/trunk/engine/tinygl/zgl.h 2008-07-26 19:11:23 UTC (rev 33313)
+++ residual/trunk/engine/tinygl/zgl.h 2008-07-26 19:24:27 UTC (rev 33314)
@@ -37,7 +37,7 @@
#define MAX_TEXTURE_STACK_DEPTH 8
#define MAX_NAME_STACK_DEPTH 64
#define MAX_TEXTURE_LEVELS 11
-#define MAX_LIGHTS 16
+#define T_MAX_LIGHTS 16
#define VERTEX_HASH_SIZE 1031
@@ -160,7 +160,7 @@
ZBuffer *zb;
/* lights */
- GLLight lights[MAX_LIGHTS];
+ GLLight lights[T_MAX_LIGHTS];
GLLight *first_light;
V4 ambient_light_model;
int local_light_model;
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