Menu
▾
▴
[Gemrb-commits] gemrb/gemrb/plugins/Core Actor.cpp,1.50,1.51 Control.cpp,1.23,1.24 GameControl.cpp,1.144,1.145 Inventory.cpp,1.22,1.23 Spellbook.cpp,1.9,1.10 TableMgr.h,1.12,1.13 Video.h,1.28,1.29
|
From: Guido de J. <gu...@us...> - 2004-07-21 20:27:36
|
Update of /cvsroot/gemrb/gemrb/gemrb/plugins/Core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20927/Core Modified Files: Actor.cpp Control.cpp GameControl.cpp Inventory.cpp Spellbook.cpp TableMgr.h Video.h Log Message: fixed several warnings Index: Inventory.cpp =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Inventory.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** Inventory.cpp 18 Jul 2004 08:33:40 -0000 1.22 --- Inventory.cpp 21 Jul 2004 20:27:26 -0000 1.23 *************** *** 408,412 **** } ! printf ( "%2d: %8s %d (%d %d %d) %lx\n", i, itm->ItemResRef, itm->Unknown08, itm->Usages[0], itm->Usages[1], itm->Usages[2], itm->Flags ); } } --- 408,412 ---- } ! printf ( "%2ld: %8s %d (%d %d %d) %lx\n", i, itm->ItemResRef, itm->Unknown08, itm->Usages[0], itm->Usages[1], itm->Usages[2], itm->Flags ); } } Index: TableMgr.h =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/TableMgr.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** TableMgr.h 24 Feb 2004 22:20:36 -0000 1.12 --- TableMgr.h 21 Jul 2004 20:27:26 -0000 1.13 *************** *** 60,65 **** virtual bool Open(DataStream* stream, bool autoFree = true) = 0; /** Returns a Row Name, returns NULL on error */ ! virtual inline int GetRowIndex(const char* rowname) const = 0; ! virtual inline char* GetRowName(unsigned int index) const = 0; }; --- 60,65 ---- virtual bool Open(DataStream* stream, bool autoFree = true) = 0; /** Returns a Row Name, returns NULL on error */ ! virtual int GetRowIndex(const char* rowname) const = 0; ! virtual char* GetRowName(unsigned int index) const = 0; }; Index: GameControl.cpp =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/GameControl.cpp,v retrieving revision 1.144 retrieving revision 1.145 diff -C2 -d -r1.144 -r1.145 *** GameControl.cpp 27 Jun 2004 19:30:06 -0000 1.144 --- GameControl.cpp 21 Jul 2004 20:27:26 -0000 1.145 *************** *** 1290,1294 **** TextArea* ta = ( TextArea* ) win->GetControl( index ); //get the first state with true triggers! ! if (choose == (unsigned long) -1) { int si = FindFirstState( target, dlg ); if (si < 0) { --- 1290,1294 ---- TextArea* ta = ( TextArea* ) win->GetControl( index ); //get the first state with true triggers! ! if (choose == (unsigned int) -1) { int si = FindFirstState( target, dlg ); if (si < 0) { Index: Video.h =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Video.h,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** Video.h 27 Jun 2004 23:47:27 -0000 1.28 --- Video.h 21 Jul 2004 20:27:26 -0000 1.29 *************** *** 86,90 **** virtual void DrawPolyline(Gem_Polygon* poly, Color& color, bool fill = false) = 0; ! virtual inline void DrawLine(short x1, short y1, short x2, short y2, Color& color) = 0; /** Frees a Palette */ --- 86,90 ---- virtual void DrawPolyline(Gem_Polygon* poly, Color& color, bool fill = false) = 0; ! virtual void DrawLine(short x1, short y1, short x2, short y2, Color& color) = 0; /** Frees a Palette */ Index: Control.cpp =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Control.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** Control.cpp 20 Jul 2004 16:22:36 -0000 1.23 --- Control.cpp 21 Jul 2004 20:27:26 -0000 1.24 *************** *** 59,62 **** --- 59,63 ---- return 0; } + /** Sets the tooltip to be displayed on the screen now */ void Control::DisplayTooltip() *************** *** 67,70 **** --- 68,72 ---- core->DisplayTooltip( 0, 0, NULL ); } + void Control::RunEventHandler(EventHandler handler) { *************** *** 76,116 **** void Control::OnKeyPress(unsigned char Key, unsigned short Mod) { ! //printf("OnKeyPress: CtrlID = 0x%08X, Key = %c (0x%02hX)\n", ControlID, Key, Key); } /** Key Release Event */ void Control::OnKeyRelease(unsigned char Key, unsigned short Mod) { ! //printf( "OnKeyRelease: CtrlID = 0x%08X, Key = %c (0x%02hX)\n", ControlID, Key, Key ); } /** Mouse Enter Event */ void Control::OnMouseEnter(unsigned short x, unsigned short y) { ! printf("OnMouseEnter: CtrlID = 0x%08X, x = %hd, y = %hd\n", ControlID, x, y); } /** Mouse Leave Event */ void Control::OnMouseLeave(unsigned short x, unsigned short y) { ! printf("OnMouseLeave: CtrlID = 0x%08X, x = %hd, y = %hd\n", ControlID, x, y); } /** Mouse Over Event */ void Control::OnMouseOver(unsigned short x, unsigned short y) { ! //printf("OnMouseOver: CtrlID = 0x%08X, x = %hd, y = %hd\n", ControlID, x, y); } /** Mouse Button Down */ void Control::OnMouseDown(unsigned short x, unsigned short y, unsigned char Button, unsigned short Mod) { ! //printf("OnMouseDown: CtrlID = 0x%08X, x = %hd, y = %hd, Button = %d, Mos = %hd\n", ControlID, x, y, Button, Mod); } /** Mouse Button Up */ void Control::OnMouseUp(unsigned short x, unsigned short y, unsigned char Button, unsigned short Mod) { ! //printf("OnMouseUp: CtrlID = 0x%08X, x = %hd, y = %hd, Button = %d, Mos = %hd\n", ControlID, x, y, Button, Mod); } /** Special Key Press */ void Control::OnSpecialKeyPress(unsigned char Key) { ! //printf("OnSpecialKeyPress: CtrlID = 0x%08X, Key = %d\n", ControlID, Key); } --- 78,126 ---- void Control::OnKeyPress(unsigned char Key, unsigned short Mod) { ! //printf("OnKeyPress: CtrlID = 0x%08X, Key = %c (0x%02hX)\n", (unsigned int) ControlID, Key, Key); } + /** Key Release Event */ void Control::OnKeyRelease(unsigned char Key, unsigned short Mod) { ! //printf( "OnKeyRelease: CtrlID = 0x%08X, Key = %c (0x%02hX)\n", (unsigned int) ControlID, Key, Key ); } + /** Mouse Enter Event */ void Control::OnMouseEnter(unsigned short x, unsigned short y) { ! printf("OnMouseEnter: CtrlID = 0x%08X, x = %hd, y = %hd\n", (unsigned int) ControlID, x, y); } + /** Mouse Leave Event */ void Control::OnMouseLeave(unsigned short x, unsigned short y) { ! printf("OnMouseLeave: CtrlID = 0x%08X, x = %hd, y = %hd\n", (unsigned int) ControlID, x, y); } + /** Mouse Over Event */ void Control::OnMouseOver(unsigned short x, unsigned short y) { ! //printf("OnMouseOver: CtrlID = 0x%08X, x = %hd, y = %hd\n", (unsigned int) ControlID, x, y); } + /** Mouse Button Down */ void Control::OnMouseDown(unsigned short x, unsigned short y, unsigned char Button, unsigned short Mod) { ! //printf("OnMouseDown: CtrlID = 0x%08X, x = %hd, y = %hd, Button = %d, Mos = %hd\n", (unsigned int) ControlID, x, y, Button, Mod); } + /** Mouse Button Up */ void Control::OnMouseUp(unsigned short x, unsigned short y, unsigned char Button, unsigned short Mod) { ! //printf("OnMouseUp: CtrlID = 0x%08X, x = %hd, y = %hd, Button = %d, Mos = %hd\n", (unsigned int) ControlID, x, y, Button, Mod); } + /** Special Key Press */ void Control::OnSpecialKeyPress(unsigned char Key) { ! //printf("OnSpecialKeyPress: CtrlID = 0x%08X, Key = %d\n", (unsigned int) ControlID, Key); } + Index: Actor.cpp =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Actor.cpp,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** Actor.cpp 11 Jul 2004 11:04:47 -0000 1.50 --- Actor.cpp 21 Jul 2004 20:27:26 -0000 1.51 *************** *** 42,45 **** --- 42,49 ---- 0x00, 0xff, 0xff, 0xff }; + static Color magenta = { + 0xff, 0x00, 0xff, 0xff + }; + /* static Color green_dark = { 0x00, 0x80, 0x00, 0xff *************** *** 54,60 **** 0x00, 0x80, 0x80, 0xff }; ! static Color magenta = { ! 0xff, 0x00, 0xff, 0xff ! }; Actor::Actor() --- 58,62 ---- 0x00, 0x80, 0x80, 0xff }; ! */ Actor::Actor() Index: Spellbook.cpp =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Spellbook.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Spellbook.cpp 25 May 2004 16:16:31 -0000 1.9 --- Spellbook.cpp 21 Jul 2004 20:27:26 -0000 1.10 *************** *** 157,166 **** void Spellbook::dump() ! { ! unsigned int i,j,k; printf( "SPELLBOOK:\n" ); ! for (i = 0; i < NUM_SPELL_TYPES; i++) { ! for (j = 0; j < spells[i].size(); j++) { CRESpellMemorization* sm = spells[i][j]; //if (!sm || !sm->Number) continue; --- 157,166 ---- void Spellbook::dump() ! { ! unsigned int k; printf( "SPELLBOOK:\n" ); ! for (int i = 0; i < NUM_SPELL_TYPES; i++) { ! for (unsigned int j = 0; j < spells[i].size(); j++) { CRESpellMemorization* sm = spells[i][j]; //if (!sm || !sm->Number) continue; |