|
From: Vincent H. <ya...@us...> - 2005-05-04 09:08:24
|
Update of /cvsroot/twin-e/twin-e/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22525 Modified Files: extra.c fullRedraw.c grid.c inventory.c life_binary.c mainLoop.c mainSDL.c mainSDLGL.c memHandler.c renderer.c text.c timer.c type.h Log Message: fix all ps2 warning Index: renderer.c =================================================================== RCS file: /cvsroot/twin-e/twin-e/src/renderer.c,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** renderer.c 21 Apr 2005 21:29:54 -0000 1.19 --- renderer.c 4 May 2005 09:08:10 -0000 1.20 *************** *** 1270,1274 **** unsigned short int ax; bh ^= 1; ! ax = (unsigned short int) out2; ax &= 1; if(ax ^ bh) --- 1270,1274 ---- unsigned short int ax; bh ^= 1; ! ax = (unsigned short int)(int) out2; ax &= 1; if(ax ^ bh) Index: memHandler.c =================================================================== RCS file: /cvsroot/twin-e/twin-e/src/memHandler.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** memHandler.c 2 Nov 2004 16:07:38 -0000 1.3 --- memHandler.c 4 May 2005 09:08:10 -0000 1.4 *************** *** 95,97 **** } ! #endif \ No newline at end of file --- 95,98 ---- } ! #endif ! Index: inventory.c =================================================================== RCS file: /cvsroot/twin-e/twin-e/src/inventory.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** inventory.c 21 Jul 2004 19:40:51 -0000 1.3 --- inventory.c 4 May 2005 09:08:10 -0000 1.4 *************** *** 98,102 **** currentSelectedObjectInInventory--; ! if(currentSelectedObjectInInventory< 0) currentSelectedObjectInInventory = 27; --- 98,102 ---- currentSelectedObjectInInventory--; ! if(currentSelectedObjectInInventory < 0) currentSelectedObjectInInventory = 27; *************** *** 110,114 **** currentSelectedObjectInInventory-=4; ! if(currentSelectedObjectInInventory< 0) currentSelectedObjectInInventory += 28; --- 110,114 ---- currentSelectedObjectInInventory-=4; ! if(currentSelectedObjectInInventory < 0) currentSelectedObjectInInventory += 28; *************** *** 134,138 **** SecondInitDialWindow(); ! if(vars[currentSelectedObjectInInventory] == 1 && !vars[70] && currentSelectedObjectInInventory<=27) { OpenDialNoWindow(currentSelectedObjectInInventory + 100); --- 134,138 ---- SecondInitDialWindow(); ! if(vars[(unsigned char)currentSelectedObjectInInventory] == 1 && !vars[70] && currentSelectedObjectInInventory<=27) { OpenDialNoWindow(currentSelectedObjectInInventory + 100); *************** *** 160,164 **** else { ! if(vars[currentSelectedObjectInInventory] == 1 && !vars[70] && currentSelectedObjectInInventory<=27) { SecondInitDialWindow(); --- 160,164 ---- else { ! if(vars[(unsigned char)currentSelectedObjectInInventory] == 1 && !vars[70] && currentSelectedObjectInInventory<=27) { SecondInitDialWindow(); *************** *** 172,176 **** DrawOneInventory(currentSelectedObjectInInventory); ! if((mainLoopVar5 & 2) && vars[currentSelectedObjectInInventory] == 1 && !vars[70] && currentSelectedObjectInInventory<=27) { mainLoopVar9 = currentSelectedObjectInInventory; --- 172,176 ---- DrawOneInventory(currentSelectedObjectInInventory); ! if((mainLoopVar5 & 2) && vars[(unsigned char)currentSelectedObjectInInventory] == 1 && !vars[70] && currentSelectedObjectInInventory<=27) { mainLoopVar9 = currentSelectedObjectInInventory; *************** *** 277,279 **** Line(bottom, right, bottom, left, param); Line(top, right, top, left, param); ! } \ No newline at end of file --- 277,279 ---- Line(bottom, right, bottom, left, param); Line(top, right, top, left, param); ! } Index: timer.c =================================================================== RCS file: /cvsroot/twin-e/twin-e/src/timer.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** timer.c 21 Jul 2004 19:40:51 -0000 1.3 --- timer.c 4 May 2005 09:08:10 -0000 1.4 *************** *** 21,23 **** /*void startThreadTimer(LBA_engine* engine) { ! }*/ \ No newline at end of file --- 21,24 ---- /*void startThreadTimer(LBA_engine* engine) { ! }*/ ! Index: fullRedraw.c =================================================================== RCS file: /cvsroot/twin-e/twin-e/src/fullRedraw.c,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** fullRedraw.c 23 Apr 2005 19:53:42 -0000 1.55 --- fullRedraw.c 4 May 2005 09:08:09 -0000 1.56 *************** *** 330,334 **** unsigned int flags; int actorNumber; ! int positionInDebugBox = 0; do --- 330,334 ---- unsigned int flags; int actorNumber; ! //int positionInDebugBox = 0; do Index: mainSDLGL.c =================================================================== RCS file: /cvsroot/twin-e/twin-e/src/mainSDLGL.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mainSDLGL.c 21 Jul 2004 19:40:51 -0000 1.2 --- mainSDLGL.c 4 May 2005 09:08:10 -0000 1.3 *************** *** 795,797 **** ! #endif \ No newline at end of file --- 795,798 ---- ! #endif ! Index: mainLoop.c =================================================================== RCS file: /cvsroot/twin-e/twin-e/src/mainLoop.c,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** mainLoop.c 23 Apr 2005 19:51:52 -0000 1.49 --- mainLoop.c 4 May 2005 09:08:10 -0000 1.50 *************** *** 2491,2495 **** void HitObj(int actorAttacking, int actorAttacked, int param, int angle) { ! actor* pActorAttacking = &actors[actorAttacking]; actor* pActorAttacked = &actors[actorAttacked]; --- 2491,2495 ---- void HitObj(int actorAttacking, int actorAttacked, int param, int angle) { ! // actor* pActorAttacking = &actors[actorAttacking]; actor* pActorAttacked = &actors[actorAttacked]; Index: life_binary.c =================================================================== RCS file: /cvsroot/twin-e/twin-e/src/life_binary.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** life_binary.c 23 Apr 2005 19:43:23 -0000 1.10 --- life_binary.c 4 May 2005 09:08:10 -0000 1.11 *************** *** 666,670 **** case 61: { ! char temp1; char temp2; --- 666,670 ---- case 61: { ! unsigned char temp1; char temp2; *************** *** 677,681 **** case 62: // LM_SUB_LIFE_POINT_OBJ { ! char localActorNumber; char subLife; --- 677,681 ---- case 62: // LM_SUB_LIFE_POINT_OBJ { ! unsigned char localActorNumber; char subLife; *************** *** 686,695 **** if (actors[localActorNumber].life < 0) ! actors[localActorNumber].life = 0; } case 63: //LM_HIT_OBJ { ! char tempActorNumber; char temp; --- 686,695 ---- if (actors[localActorNumber].life < 0) ! actors[localActorNumber].life = 0; } case 63: //LM_HIT_OBJ { ! unsigned char tempActorNumber; char temp; *************** *** 960,964 **** case 91: //LM_ASK_CHOICE_OBJ { ! char currentTalkingActor; short int choiceNumber; --- 960,964 ---- case 91: //LM_ASK_CHOICE_OBJ { ! unsigned char currentTalkingActor; short int choiceNumber; Index: text.c =================================================================== RCS file: /cvsroot/twin-e/twin-e/src/text.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** text.c 22 Apr 2005 10:47:19 -0000 1.14 --- text.c 4 May 2005 09:08:10 -0000 1.15 *************** *** 50,54 **** void printTextFullScreen(int textIndex) { ! int isVoxSet; int temp2; int temp3 = 0; --- 50,54 ---- void printTextFullScreen(int textIndex) { ! int isVoxSet = 0; int temp2; int temp3 = 0; Index: extra.c =================================================================== RCS file: /cvsroot/twin-e/twin-e/src/extra.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** extra.c 23 Apr 2005 19:48:05 -0000 1.12 --- extra.c 4 May 2005 09:08:09 -0000 1.13 *************** *** 314,322 **** int i; ! int currentExtraX; ! int currentExtraZ; ! int currentExtraY; ! int currentExtraSpeedX; ! int currentExtraSpeedZ; int var_40; --- 314,322 ---- int i; ! int currentExtraX = 0; ! int currentExtraZ = 0; ! int currentExtraY = 0; ! int currentExtraSpeedX = 0; ! int currentExtraSpeedZ = 0; int var_40; *************** *** 772,777 **** void ThrowMagicBall(int X, int Z, int Y, int param1, int angle, int param2, int param3) { ! int ballSprite; ! int ballStrength; switch(magicLevel) --- 772,777 ---- void ThrowMagicBall(int X, int Z, int Y, int param1, int angle, int param2, int param3) { ! int ballSprite = -1; ! int ballStrength = 0; switch(magicLevel) Index: type.h =================================================================== RCS file: /cvsroot/twin-e/twin-e/src/type.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** type.h 4 May 2005 07:57:42 -0000 1.7 --- type.h 4 May 2005 09:08:10 -0000 1.8 *************** *** 25,30 **** --- 25,32 ---- typedef unsigned long uint32; #ifndef __linux__ + #ifndef _TAMTYPES_H_ typedef unsigned int uint; #endif + #endif typedef signed char int8; typedef signed short int16; Index: mainSDL.c =================================================================== RCS file: /cvsroot/twin-e/twin-e/src/mainSDL.c,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** mainSDL.c 4 May 2005 07:57:42 -0000 1.33 --- mainSDL.c 4 May 2005 09:08:10 -0000 1.34 *************** *** 98,104 **** --- 98,106 ---- //int frames=0; /* Number of frames displayed */ + #ifndef _EE long int t_start,t_left; long unsigned int t_end; long int q=0; /* Dummy */ + #endif while(!breakmainLoop) // To be able to quit the game ;) *************** *** 171,179 **** // object used for the SDL port { ! int rendersolid = 0; int renderstyle = 0; ! int rendertype = 0; ! int ptsize = 11; unsigned char *keyboard; int size; --- 173,181 ---- // object used for the SDL port { ! /* int rendersolid = 0; int renderstyle = 0; ! int rendertype = 0; */ ! //int ptsize = 11; unsigned char *keyboard; int size; Index: grid.c =================================================================== RCS file: /cvsroot/twin-e/twin-e/src/grid.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** grid.c 21 Jul 2004 19:40:51 -0000 1.2 --- grid.c 4 May 2005 09:08:10 -0000 1.3 *************** *** 15,17 **** along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ! */ \ No newline at end of file --- 15,18 ---- along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ! */ ! |