Menu
▾
▴
timewarp-commit — Shows each and every CVS commit - high volume
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(136) |
Dec
(218) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(214) |
Feb
(208) |
Mar
(186) |
Apr
(15) |
May
(3) |
Jun
(35) |
Jul
(6) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2005 |
Jan
(1) |
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
(58) |
Aug
(123) |
Sep
(31) |
Oct
(9) |
Nov
|
Dec
(1) |
| 2006 |
Jan
(25) |
Feb
(10) |
Mar
(25) |
Apr
(61) |
May
|
Jun
(78) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
(12) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(10) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <yu...@us...> - 2004-02-04 21:22:46
|
Update of /cvsroot/timewarp/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21501/source Modified Files: scp.cpp Log Message: get rid of "null" constant that defined in jgmod.h header Index: scp.cpp =================================================================== RCS file: /cvsroot/timewarp/source/scp.cpp,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** scp.cpp 4 Feb 2004 21:12:00 -0000 1.45 --- scp.cpp 4 Feb 2004 21:20:21 -0000 1.46 *************** *** 247,266 **** #endif {DATAFILE * data = load_datafile_object("TitleScreen.dat", "MENUACCEPT"); ! if (data != null && data->type==DAT_SAMPLE) { menuAccept = (SAMPLE*) data->dat; }} {DATAFILE * data = load_datafile_object("TitleScreen.dat", "MENUFOCUS"); ! if (data != null && data->type==DAT_SAMPLE) { menuFocus = (SAMPLE*) data->dat; }} {DATAFILE * data = load_datafile_object("TitleScreen.dat", "MENUDISABLED"); ! if (data != null && data->type==DAT_SAMPLE) { menuDisabled = (SAMPLE*) data->dat; }} {DATAFILE * data = load_datafile_object("TitleScreen.dat", "MENUSPECIAL"); ! if (data != null && data->type==DAT_SAMPLE) { menuSpecial = (SAMPLE*) data->dat; }} --- 247,266 ---- #endif {DATAFILE * data = load_datafile_object("TitleScreen.dat", "MENUACCEPT"); ! if (data != NULL && data->type==DAT_SAMPLE) { menuAccept = (SAMPLE*) data->dat; }} {DATAFILE * data = load_datafile_object("TitleScreen.dat", "MENUFOCUS"); ! if (data != NULL && data->type==DAT_SAMPLE) { menuFocus = (SAMPLE*) data->dat; }} {DATAFILE * data = load_datafile_object("TitleScreen.dat", "MENUDISABLED"); ! if (data != NULL && data->type==DAT_SAMPLE) { menuDisabled = (SAMPLE*) data->dat; }} {DATAFILE * data = load_datafile_object("TitleScreen.dat", "MENUSPECIAL"); ! if (data != NULL && data->type==DAT_SAMPLE) { menuSpecial = (SAMPLE*) data->dat; }} *************** *** 290,294 **** } ! if (logo!=null) { if (screen->w/2 >= logo->w) { draw_sprite(screen, logo, screen->w/2 - logo->w/2, screen->h/2 - logo->h/2); --- 290,294 ---- } ! if (logo != NULL ) { if (screen->w/2 >= logo->w) { draw_sprite(screen, logo, screen->w/2 - logo->w/2, screen->h/2 - logo->h/2); |
|
From: <yu...@us...> - 2004-02-04 21:14:27
|
Update of /cvsroot/timewarp/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19164/source Modified Files: scp.cpp Log Message: Setting $(NAME) dependences in makefile properly. Fixed compilation problem without jgmod library. Index: scp.cpp =================================================================== RCS file: /cvsroot/timewarp/source/scp.cpp,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** scp.cpp 4 Feb 2004 10:36:27 -0000 1.44 --- scp.cpp 4 Feb 2004 21:12:00 -0000 1.45 *************** *** 73,78 **** #include "util/sounds.h" #include "jgmod.h" ! //deprecated. This mode of using dat files is terrible, I can't believe --- 73,79 ---- #include "util/sounds.h" + #ifndef NO_JGMOD #include "jgmod.h" ! #endif //deprecated. This mode of using dat files is terrible, I can't believe *************** *** 238,241 **** --- 239,243 ---- tw_error("Couldnt load title music"); + #ifndef NO_JGMOD Music * mymusic = load_mod("TitleScreen.dat#TITLEMUSIC"); if (!mymusic) *************** *** 243,247 **** sound.play_music( mymusic, TRUE); ! {DATAFILE * data = load_datafile_object("TitleScreen.dat", "MENUACCEPT"); if (data != null && data->type==DAT_SAMPLE) { --- 245,249 ---- sound.play_music( mymusic, TRUE); ! #endif {DATAFILE * data = load_datafile_object("TitleScreen.dat", "MENUACCEPT"); if (data != null && data->type==DAT_SAMPLE) { |
|
From: <yu...@us...> - 2004-02-04 21:14:26
|
Update of /cvsroot/timewarp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19164 Modified Files: makefile twwin.sln twwin.vcproj Log Message: Setting $(NAME) dependences in makefile properly. Fixed compilation problem without jgmod library. Index: twwin.sln =================================================================== RCS file: /cvsroot/timewarp/twwin.sln,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** twwin.sln 17 Jan 2004 22:47:23 -0000 1.1 --- twwin.sln 4 Feb 2004 21:12:00 -0000 1.2 *************** *** 1,4 **** Microsoft Visual Studio Solution File, Format Version 8.00 ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "twwin", "twwin.vcproj", "{26150E92-2D49-46DF-9B58-5EAB02074607}" ProjectSection(ProjectDependencies) = postProject EndProjectSection --- 1,4 ---- Microsoft Visual Studio Solution File, Format Version 8.00 ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "twwin", "twwin.vcproj", "{976F0087-4D80-4E9C-B802-38973D91AEFA}" ProjectSection(ProjectDependencies) = postProject EndProjectSection *************** *** 10,17 **** EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution ! {26150E92-2D49-46DF-9B58-5EAB02074607}.Debug.ActiveCfg = Debug|Win32 ! {26150E92-2D49-46DF-9B58-5EAB02074607}.Debug.Build.0 = Debug|Win32 ! {26150E92-2D49-46DF-9B58-5EAB02074607}.Release.ActiveCfg = Release|Win32 ! {26150E92-2D49-46DF-9B58-5EAB02074607}.Release.Build.0 = Release|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution --- 10,17 ---- EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution ! {976F0087-4D80-4E9C-B802-38973D91AEFA}.Debug.ActiveCfg = Debug|Win32 ! {976F0087-4D80-4E9C-B802-38973D91AEFA}.Debug.Build.0 = Debug|Win32 ! {976F0087-4D80-4E9C-B802-38973D91AEFA}.Release.ActiveCfg = Release|Win32 ! {976F0087-4D80-4E9C-B802-38973D91AEFA}.Release.Build.0 = Release|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution Index: twwin.vcproj =================================================================== RCS file: /cvsroot/timewarp/twwin.vcproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** twwin.vcproj 17 Jan 2004 22:47:23 -0000 1.1 --- twwin.vcproj 4 Feb 2004 21:12:00 -0000 1.2 *************** *** 21,33 **** <Tool Name="VCCLCompilerTool" ! Optimization="1" InlineFunctionExpansion="2" ImproveFloatingPointConsistency="TRUE" ! OptimizeForProcessor="2" ! AdditionalIncludeDirectories="./include,./source,./source/gamex" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;__i386__" - StringPooling="TRUE" RuntimeLibrary="2" [...6244 lines suppressed...] + RelativePath="include\lua.h"> + </File> + <File + RelativePath="include\lualib.h"> + </File> </Filter> </Filter> *************** *** 6296,6305 **** Name="Resource Files" Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"> - <File - RelativePath="scpwin.ico"> - </File> - <File - RelativePath="scpwin.rc"> - </File> </Filter> </Files> --- 5907,5910 ---- |
|
From: <yu...@us...> - 2004-02-04 21:14:26
|
Update of /cvsroot/timewarp/source/melee In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19164/source/melee Modified Files: mfleet.cpp Log Message: Setting $(NAME) dependences in makefile properly. Fixed compilation problem without jgmod library. Index: mfleet.cpp =================================================================== RCS file: /cvsroot/timewarp/source/melee/mfleet.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** mfleet.cpp 1 Feb 2004 08:35:15 -0000 1.21 --- mfleet.cpp 4 Feb 2004 21:12:00 -0000 1.22 *************** *** 15,18 **** --- 15,19 ---- #include <string.h> #include <stdio.h> + #include <ctype.h> #include <stdlib.h> #include <allegro.h> *************** *** 482,491 **** int Fleet::getNextFleetEntryByCharacter(int currentShip, char c) { ! ASSERT(ships.at(currentShip) != null); ASSERT(currentShip < ships.size()); ASSERT(currentShip >=0); c = toupper(c); ! ! for (int i=currentShip+1; i<ships.size(); i++) { MyFleetShipType temp = ships.at(i); ASSERT(temp!=NULL); --- 483,493 ---- int Fleet::getNextFleetEntryByCharacter(int currentShip, char c) { ! ASSERT(ships.at(currentShip) != NULL); ASSERT(currentShip < ships.size()); ASSERT(currentShip >=0); c = toupper(c); ! ! int i; ! for (i=currentShip+1; i<ships.size(); i++) { MyFleetShipType temp = ships.at(i); ASSERT(temp!=NULL); |
|
From: <yu...@us...> - 2004-02-04 21:14:26
|
Update of /cvsroot/timewarp/source/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19164/source/util Modified Files: errors.h Log Message: Setting $(NAME) dependences in makefile properly. Fixed compilation problem without jgmod library. Index: errors.h =================================================================== RCS file: /cvsroot/timewarp/source/util/errors.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** errors.h 29 Jan 2004 21:35:16 -0000 1.10 --- errors.h 4 Feb 2004 21:12:00 -0000 1.11 *************** *** 90,98 **** void error_handler ( const char *message); extern void (*_error_handler) ( const char *src_file, int line, const char *message ); ! #ifdef __cplusplus ! typedef void (*ERROR_FUNC_TYPE)(const char *fmt = "", ...); ! #else typedef void (*ERROR_FUNC_TYPE)(const char *fmt, ...); ! #endif ERROR_FUNC_TYPE _prep_error_func ( const char *file, int line ); void _prep_error(const char *file, int line); --- 90,96 ---- void error_handler ( const char *message); extern void (*_error_handler) ( const char *src_file, int line, const char *message ); ! typedef void (*ERROR_FUNC_TYPE)(const char *fmt, ...); ! ERROR_FUNC_TYPE _prep_error_func ( const char *file, int line ); void _prep_error(const char *file, int line); |
|
From: <you...@us...> - 2004-02-04 10:38:50
|
Update of /cvsroot/timewarp/source/melee In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15114/source/melee Modified Files: mcontrol.cpp moptions.cpp Log Message: made most buttons make standard SC sounds; added SC sounds to TitleScreen.dat; added my_d_button_proc to handle buttons Index: mcontrol.cpp =================================================================== RCS file: /cvsroot/timewarp/source/melee/mcontrol.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** mcontrol.cpp 29 Jan 2004 21:20:29 -0000 1.15 --- mcontrol.cpp 4 Feb 2004 10:36:28 -0000 1.16 *************** *** 231,238 **** { my_list_proc, 5, 5, 280, 400, 255, 0, 0, D_EXIT, 0, 0, (void *)fleetListboxGetter, NULL, NULL }, { d_textbox_proc, 300, 10, 240, 80, 255, 0, 0, 0, 0, 0, (void *)selectTitleString, NULL, NULL }, ! { d_button_proc, 330, 110, 180, 35, 255, 0, 0, D_EXIT, 0, 0, (void *)"Select ship", NULL, NULL }, ! { d_button_proc, 330, 165, 180, 35, 255, 0, 0, D_EXIT, 0, 0, (void *)"Random selection", NULL, NULL }, ! { d_button_proc, 330, 220, 180, 35, 255, 0, 0, D_EXIT, 0, 0, (void *)"Always random", NULL, NULL }, ! { d_button_proc, 330, 275, 180, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Ship Info", NULL, NULL }, { my_bitmap_proc, 388, 330, 64, 100, 255, 0, 0, D_EXIT, 0, 0, NULL, NULL, NULL }, { d_tw_yield_proc, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, --- 231,238 ---- { my_list_proc, 5, 5, 280, 400, 255, 0, 0, D_EXIT, 0, 0, (void *)fleetListboxGetter, NULL, NULL }, { d_textbox_proc, 300, 10, 240, 80, 255, 0, 0, 0, 0, 0, (void *)selectTitleString, NULL, NULL }, ! { my_d_button_proc, 330, 110, 180, 35, 255, 0, 0, D_EXIT, 0, 0, (void *)"Select ship", NULL, NULL }, ! { my_d_button_proc, 330, 165, 180, 35, 255, 0, 0, D_EXIT, 0, 0, (void *)"Random selection", NULL, NULL }, ! { my_d_button_proc, 330, 220, 180, 35, 255, 0, 0, D_EXIT, 0, 0, (void *)"Always random", NULL, NULL }, ! { my_d_button_proc, 330, 275, 180, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Ship Info", NULL, NULL }, { my_bitmap_proc, 388, 330, 64, 100, 255, 0, 0, D_EXIT, 0, 0, NULL, NULL, NULL }, { d_tw_yield_proc, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, Index: moptions.cpp =================================================================== RCS file: /cvsroot/timewarp/source/melee/moptions.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** moptions.cpp 29 Jan 2004 21:20:29 -0000 1.13 --- moptions.cpp 4 Feb 2004 10:36:28 -0000 1.14 *************** *** 66,75 **** // (dialog proc) (x) (y) (w) (h) (fg) (bg) (key) (flags) (d1) (d2) (dp) { d_box_proc, 40, 30, 190, 270, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, ! { d_button_proc, 70, 40, 110, 40, 255, 0, 0, D_EXIT, 0, 0, (void *)"Done", NULL, NULL }, ! { d_button_proc, 50, 90, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Video Mode", NULL, NULL }, ! { d_button_proc, 50, 130, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Audio Settings", NULL, NULL }, ! { d_button_proc, 50, 170, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Game && Rendering", NULL, NULL }, ! // { d_button_proc, 50, 210, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Physics Settings", NULL, NULL }, ! // { d_button_proc, 50, 250, 170, 40, 255, 0, 0, D_EXIT, 0, 0, (void *)"Restore Defaults", NULL, NULL }, { d_tw_yield_proc, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, { NULL, 0, 0, 0, 0, 255, 0, 0, 0, 1, 0, NULL, NULL, NULL } --- 66,75 ---- // (dialog proc) (x) (y) (w) (h) (fg) (bg) (key) (flags) (d1) (d2) (dp) { d_box_proc, 40, 30, 190, 270, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, ! { my_d_button_proc, 70, 40, 110, 40, 255, 0, 0, D_EXIT, 0, 0, (void *)"Done", NULL, NULL }, ! { my_d_button_proc, 50, 90, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Video Mode", NULL, NULL }, ! { my_d_button_proc, 50, 130, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Audio Settings", NULL, NULL }, ! { my_d_button_proc, 50, 170, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Game && Rendering", NULL, NULL }, ! // { my_d_button_proc, 50, 210, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Physics Settings", NULL, NULL }, ! // { my_d_button_proc, 50, 250, 170, 40, 255, 0, 0, D_EXIT, 0, 0, (void *)"Restore Defaults", NULL, NULL }, { d_tw_yield_proc, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, { NULL, 0, 0, 0, 0, 255, 0, 0, 0, 1, 0, NULL, NULL, NULL } *************** *** 123,127 **** { d_box_proc, 120, 140, 368, 90, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, { d_text_proc, 130, 150, 348, 30, 255, 0, 0, 0, 0, 0, (void *)"Do you want to keep these settings?", NULL, NULL }, ! { d_button_proc, 130, 190, 174, 30, 255, 0, 0,D_EXIT, 0, 0, (void *)"Yes", NULL, NULL }, { d_button_proc, 294, 190, 174, 30, 255, 0, 0,D_EXIT, 0, 0, (void *)"No", NULL, NULL }, { NULL, 0, 0, 0, 0, 255, 0, 0, 0, 3, 0, NULL, NULL, NULL } --- 123,127 ---- { d_box_proc, 120, 140, 368, 90, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, { d_text_proc, 130, 150, 348, 30, 255, 0, 0, 0, 0, 0, (void *)"Do you want to keep these settings?", NULL, NULL }, ! { my_d_button_proc, 130, 190, 174, 30, 255, 0, 0,D_EXIT, 0, 0, (void *)"Yes", NULL, NULL }, { d_button_proc, 294, 190, 174, 30, 255, 0, 0,D_EXIT, 0, 0, (void *)"No", NULL, NULL }, { NULL, 0, 0, 0, 0, 255, 0, 0, 0, 3, 0, NULL, NULL, NULL } *************** *** 180,185 **** { d_button_proc, 32, 30, 100, 35, 255, 0, 0,D_EXIT, 0, 0, (void *)"Exit", NULL, NULL },//DIALOG_VIDEO_EXIT ! { d_button_proc, 143, 30, 260, 35, 255, 0, 0,D_EXIT, 0, 0, (void *)"Restore Default", NULL, NULL },//DIALOG_VIDEO_GET_DEFAULT ! { d_button_proc, 32, 70, 100, 35, 255, 0, 0,D_EXIT, 0, 0, (void *)"Ok", NULL, NULL },//DIALOG_VIDEO_SET_DEFAULT { d_text_proc, 170, 310, 160, 20, 255, 0, 0, 0, 0, 0, (void *)"Gamma Correction", NULL, NULL },//DIALOG_VIDEO_GAMMA_TEXT --- 180,185 ---- { d_button_proc, 32, 30, 100, 35, 255, 0, 0,D_EXIT, 0, 0, (void *)"Exit", NULL, NULL },//DIALOG_VIDEO_EXIT ! { my_d_button_proc, 143, 30, 260, 35, 255, 0, 0,D_EXIT, 0, 0, (void *)"Restore Default", NULL, NULL },//DIALOG_VIDEO_GET_DEFAULT ! { my_d_button_proc, 32, 70, 100, 35, 255, 0, 0,D_EXIT, 0, 0, (void *)"Ok", NULL, NULL },//DIALOG_VIDEO_SET_DEFAULT { d_text_proc, 170, 310, 160, 20, 255, 0, 0, 0, 0, 0, (void *)"Gamma Correction", NULL, NULL },//DIALOG_VIDEO_GAMMA_TEXT *************** *** 342,346 **** // (dialog proc) (x) (y) (w) (h) (fg) (bg) (key) (flags) (d1) (d2) (dp) { d_box_proc, 30, 50, 410, 140, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, ! { d_button_proc, 100, 60, 80, 40, 255, 0, 0, D_EXIT, 0, 0, (void *)"OK", NULL, NULL }, { d_button_proc, 200, 60, 80, 40, 255, 0, 0, D_EXIT, 0, 0, (void *)"Cancel", NULL, NULL }, { d_check_proc, 40, 110, 160, 20, 255, 0, 0, 0, 0, 0, (void *)"Sound Volume ", NULL, NULL }, --- 342,346 ---- // (dialog proc) (x) (y) (w) (h) (fg) (bg) (key) (flags) (d1) (d2) (dp) { d_box_proc, 30, 50, 410, 140, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, ! { my_d_button_proc, 100, 60, 80, 40, 255, 0, 0, D_EXIT, 0, 0, (void *)"OK", NULL, NULL }, { d_button_proc, 200, 60, 80, 40, 255, 0, 0, D_EXIT, 0, 0, (void *)"Cancel", NULL, NULL }, { d_check_proc, 40, 110, 160, 20, 255, 0, 0, 0, 0, 0, (void *)"Sound Volume ", NULL, NULL }, *************** *** 462,466 **** { d_text_proc, 292, 244, 120, 20, 255, 0, 0, 0, 0, 0, (void *)"View", NULL, NULL }, { d_list_proc, 284, 264, 180, 90, 255, 0, 0, 0, 0, 0, (void *) viewListboxGetter, NULL, NULL }, ! { d_button_proc, 400, 60, 80, 40, 255, 0, 0, D_EXIT, 0, 0, (void *)"OK", NULL, NULL }, { d_button_proc, 400, 116, 80, 40, 255, 0, 0, D_EXIT, 0, 0, (void *)"Cancel", NULL, NULL }, --- 462,466 ---- { d_text_proc, 292, 244, 120, 20, 255, 0, 0, 0, 0, 0, (void *)"View", NULL, NULL }, { d_list_proc, 284, 264, 180, 90, 255, 0, 0, 0, 0, 0, (void *) viewListboxGetter, NULL, NULL }, ! { my_d_button_proc,400, 60, 80, 40, 255, 0, 0, D_EXIT, 0, 0, (void *)"OK", NULL, NULL }, { d_button_proc, 400, 116, 80, 40, 255, 0, 0, D_EXIT, 0, 0, (void *)"Cancel", NULL, NULL }, |
|
From: <you...@us...> - 2004-02-04 10:38:50
|
Update of /cvsroot/timewarp/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15114/source Modified Files: gui.cpp gui.h scp.cpp scp.h Log Message: made most buttons make standard SC sounds; added SC sounds to TitleScreen.dat; added my_d_button_proc to handle buttons Index: gui.cpp =================================================================== RCS file: /cvsroot/timewarp/source/gui.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** gui.cpp 3 Feb 2004 06:20:00 -0000 1.13 --- gui.cpp 4 Feb 2004 10:36:27 -0000 1.14 *************** *** 7,10 **** --- 7,11 ---- REGISTER_FILE + #include "scp.h" // for menu sounds #include "gui.h" #include "melee/mgame.h" *************** *** 1069,1070 **** --- 1070,1110 ---- return D_O_K; } + + /** + */ + int my_d_button_proc(int msg, DIALOG * d, int c) { + int ret = 0; + + ret = d_button_proc(msg, d, c); + + switch (msg) { + case MSG_END: + if (d->flags & D_DISABLED) { + if (menuDisabled != NULL) + sound.play(menuDisabled, 128); + } + else { + if (menuAccept != NULL) + sound.play(menuAccept, 64); + } + + //if (d->flags & D_SPECIAL_BUTTON) { + //if (menuSpecial != NULL) + // sound.play(menuSpecial, 128); + //} + break; + + case MSG_GOTFOCUS: + if (menuFocus != NULL) + sound.play(menuFocus, 128); + break; + + }; + return ret; + } + + + + + + Index: gui.h =================================================================== RCS file: /cvsroot/timewarp/source/gui.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** gui.h 3 Feb 2004 13:21:30 -0000 1.4 --- gui.h 4 Feb 2004 10:36:27 -0000 1.5 *************** *** 14,17 **** --- 14,27 ---- + //button proc with standard SC sounds :) + int my_d_button_proc(int msg, DIALOG * d, int c); + + // this is a flag for buttons which specifies that its activate sound should be special. + // you should OR this with the button's flags to enable it. + #define D_SPECIAL_BUTTON (D_USER*2) + + + + /* TimeWarps own custom GUI Index: scp.cpp =================================================================== RCS file: /cvsroot/timewarp/source/scp.cpp,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** scp.cpp 4 Feb 2004 07:32:09 -0000 1.43 --- scp.cpp 4 Feb 2004 10:36:27 -0000 1.44 *************** *** 71,74 **** --- 71,76 ---- #include "melee/mfleet.h" + #include "util/sounds.h" + #include "jgmod.h" *************** *** 147,158 **** // (dialog proc) (x) (y) (w) (h) (fg) (bg) (key) (flags) (d1) (d2) (dp) { d_shadow_box_proc, 40, 40, 180, 215, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, ! { d_button_proc, 45, 45, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Melee" , NULL, NULL }, ! { d_button_proc, 45, 80, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Extended Menu" , NULL, NULL }, ! { d_button_proc, 45, 115, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Teams" , NULL, NULL }, ! { d_button_proc, 45, 150, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Options", NULL, NULL }, ! { d_button_proc, 45, 185, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Help", NULL, NULL }, ! { d_button_proc, 45, 220, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Exit", NULL, NULL }, #ifdef INCLUDE_GAMEX ! { d_button_proc, 550, 440, 50, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"FG" , NULL, NULL }, #endif { d_tw_yield_proc, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, --- 149,161 ---- // (dialog proc) (x) (y) (w) (h) (fg) (bg) (key) (flags) (d1) (d2) (dp) { d_shadow_box_proc, 40, 40, 180, 215, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, ! { my_d_button_proc, 45, 45, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Melee" , NULL, NULL }, ! { my_d_button_proc, 45, 80, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Extended Menu" , NULL, NULL }, ! { my_d_button_proc, 45, 115, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Teams" , NULL, NULL }, ! { my_d_button_proc, 45, 150, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Options", NULL, NULL }, ! { my_d_button_proc, 45, 185, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Help", NULL, NULL }, ! { my_d_button_proc, 45, 220, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Exit", NULL, NULL }, #ifdef INCLUDE_GAMEX ! { my_d_button_proc, 550, 440, 50, 30, 255, 0, 0, D_EXIT | D_SPECIAL_BUTTON, ! 0, 0, (void *)"FG" , NULL, NULL }, #endif { d_tw_yield_proc, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, *************** *** 172,176 **** { d_box_proc, 180, 210, 280, 60, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, { d_edit_proc, 190, 220, 260, 10, 255, 0, 0, 0, 80, 0, (void *) title_str, NULL, NULL }, ! { d_button_proc, 255, 240, 60, 18, 255, 0, 0, D_EXIT, 0, 0, (void *)"OK", NULL, NULL }, { d_button_proc, 325, 240, 60, 18, 255, 0, 0, D_EXIT, 0, 0, (void *)"Cancel", NULL, NULL }, { d_tw_yield_proc, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, --- 175,179 ---- { d_box_proc, 180, 210, 280, 60, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, { d_edit_proc, 190, 220, 260, 10, 255, 0, 0, 0, 80, 0, (void *) title_str, NULL, NULL }, ! { my_d_button_proc, 255, 240, 60, 18, 255, 0, 0, D_EXIT, 0, 0, (void *)"OK", NULL, NULL }, { d_button_proc, 325, 240, 60, 18, 255, 0, 0, D_EXIT, 0, 0, (void *)"Cancel", NULL, NULL }, { d_tw_yield_proc, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, *************** *** 221,224 **** --- 224,233 ---- } + + + SAMPLE * menuAccept = NULL; + SAMPLE * menuFocus = NULL; + SAMPLE * menuDisabled = NULL; + SAMPLE * menuSpecial = NULL; /** loads up the title screen and music, and starts playing the background menu music. *************** *** 234,237 **** --- 243,267 ---- sound.play_music( mymusic, TRUE); + + {DATAFILE * data = load_datafile_object("TitleScreen.dat", "MENUACCEPT"); + if (data != null && data->type==DAT_SAMPLE) { + menuAccept = (SAMPLE*) data->dat; + }} + + {DATAFILE * data = load_datafile_object("TitleScreen.dat", "MENUFOCUS"); + if (data != null && data->type==DAT_SAMPLE) { + menuFocus = (SAMPLE*) data->dat; + }} + + {DATAFILE * data = load_datafile_object("TitleScreen.dat", "MENUDISABLED"); + if (data != null && data->type==DAT_SAMPLE) { + menuDisabled = (SAMPLE*) data->dat; + }} + + {DATAFILE * data = load_datafile_object("TitleScreen.dat", "MENUSPECIAL"); + if (data != null && data->type==DAT_SAMPLE) { + menuSpecial = (SAMPLE*) data->dat; + }} + } *************** *** 310,314 **** { d_edit_proc, 50, 250, 460, 30, 255, 0, 0, 0, 75, 0, dialog_string[1], NULL, NULL }, //{ d_check_proc, 50, 290, 160, 20, 255, 0, 0, 0, 0, 0, (void *)"Two Local Players", NULL, NULL }, ! { d_button_proc, 50, 320, 160, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Connect", NULL, NULL }, { d_button_proc, 350, 320, 160, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Abort", NULL, NULL }, { d_tw_yield_proc, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, --- 340,344 ---- { d_edit_proc, 50, 250, 460, 30, 255, 0, 0, 0, 75, 0, dialog_string[1], NULL, NULL }, //{ d_check_proc, 50, 290, 160, 20, 255, 0, 0, 0, 0, 0, (void *)"Two Local Players", NULL, NULL }, ! { my_d_button_proc, 50, 320, 160, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Connect", NULL, NULL }, { d_button_proc, 350, 320, 160, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Abort", NULL, NULL }, { d_tw_yield_proc, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, *************** *** 345,349 **** { d_edit_proc, 180, 140, 120, 25, 255, 0, 0, 0, 5, 0, dialog_string[1], NULL, NULL }, //{ d_check_proc, 140, 170, 160, 20, 255, 0, 0, 0, 0, 0, (void *)"Two Local Players", NULL, NULL }, ! { d_button_proc, 140, 200, 120, 30, 255, 0, 0, D_EXIT, 0, 0, (void*) "OK", NULL, NULL }, { d_button_proc, 280, 200, 120, 30, 255, 0, 0, D_EXIT, 0, 0, (void*) "Cancel", NULL, NULL }, { d_tw_yield_proc, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, --- 375,379 ---- { d_edit_proc, 180, 140, 120, 25, 255, 0, 0, 0, 5, 0, dialog_string[1], NULL, NULL }, //{ d_check_proc, 140, 170, 160, 20, 255, 0, 0, 0, 0, 0, (void *)"Two Local Players", NULL, NULL }, ! { my_d_button_proc, 140, 200, 120, 30, 255, 0, 0, D_EXIT, 0, 0, (void*) "OK", NULL, NULL }, { d_button_proc, 280, 200, 120, 30, 255, 0, 0, D_EXIT, 0, 0, (void*) "Cancel", NULL, NULL }, { d_tw_yield_proc, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, *************** *** 969,981 **** // (dialog proc) (x) (y) (w) (h) (fg) (bg) (key) (flags) (d1) (d2) (dp) { d_shadow_box_proc, 40, 40, 240, 300, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, ! { d_button_proc, 50, 50, 190, 20, 255, 0, 0, D_EXIT, 0, 0, (void *)"Play Game" , NULL, NULL }, ! { d_button_proc, 50, 75, 190, 20, 255, 0, 0, D_EXIT, 0, 0, (void *)"Play Game / Net1 Server" , NULL, NULL }, ! { d_button_proc, 50, 100, 190, 20, 255, 0, 0, D_EXIT, 0, 0, (void *)"Play Game / Net1 Client" , NULL, NULL }, ! { d_button_proc, 50, 125, 190, 20, 255, 0, 0, D_EXIT, 0, 0, (void *)"Playback Demo Recording" , NULL, NULL }, ! { d_button_proc, 50, 150, 190, 20, 255, 0, 0, D_EXIT, 0, 0, (void *)"Save Demo Recording" , NULL, NULL }, ! { d_button_proc, 50, 175, 190, 20, 255, 0, 0, D_EXIT, 0, 0, (void *)"Clear State", NULL, NULL }, ! { d_button_proc, 50, 200, 190, 20, 255, 0, 0, D_EXIT, 0, 0, (void *)"Key Tester", NULL, NULL }, ! { d_button_proc, 50, 225, 190, 20, 255, 0, 0, D_EXIT, 0, 0, (void *)"Ship Info", NULL, NULL }, ! { d_button_proc, 50, 250, 190, 20, 255, 0, 0, D_EXIT, 0, 0, (void *)"Diagnostics", NULL, NULL }, { d_button_proc, 80, 280, 190, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Main Menu", NULL, NULL }, { d_tw_yield_proc, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, --- 999,1011 ---- // (dialog proc) (x) (y) (w) (h) (fg) (bg) (key) (flags) (d1) (d2) (dp) { d_shadow_box_proc, 40, 40, 240, 300, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, ! { my_d_button_proc, 50, 50, 190, 20, 255, 0, 0, D_EXIT, 0, 0, (void *)"Play Game" , NULL, NULL }, ! { my_d_button_proc, 50, 75, 190, 20, 255, 0, 0, D_EXIT, 0, 0, (void *)"Play Game / Net1 Server" , NULL, NULL }, ! { my_d_button_proc, 50, 100, 190, 20, 255, 0, 0, D_EXIT, 0, 0, (void *)"Play Game / Net1 Client" , NULL, NULL }, ! { my_d_button_proc, 50, 125, 190, 20, 255, 0, 0, D_EXIT, 0, 0, (void *)"Playback Demo Recording" , NULL, NULL }, ! { my_d_button_proc, 50, 150, 190, 20, 255, 0, 0, D_EXIT, 0, 0, (void *)"Save Demo Recording" , NULL, NULL }, ! { my_d_button_proc, 50, 175, 190, 20, 255, 0, 0, D_EXIT, 0, 0, (void *)"Clear State", NULL, NULL }, ! { my_d_button_proc, 50, 200, 190, 20, 255, 0, 0, D_EXIT, 0, 0, (void *)"Key Tester", NULL, NULL }, ! { my_d_button_proc, 50, 225, 190, 20, 255, 0, 0, D_EXIT, 0, 0, (void *)"Ship Info", NULL, NULL }, ! { my_d_button_proc, 50, 250, 190, 20, 255, 0, 0, D_EXIT, 0, 0, (void *)"Diagnostics", NULL, NULL }, { d_button_proc, 80, 280, 190, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Main Menu", NULL, NULL }, { d_tw_yield_proc, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, *************** *** 1083,1091 **** { d_list_proc, 290, 70, 160, 160, 255, 0, 0, D_EXIT, 0, 0, (void *)controlListboxGetter, NULL, NULL }, { d_check_proc, 100, 236, 120, 20, 255, 0, 0, 0, 1, 0, (void *)"Teams in Net Games", NULL, NULL }, ! { d_button_proc, 295, 240, 150, 20, 255, 0, 0, D_EXIT, 0, 0, (void *)"Select Controller", NULL, NULL }, ! { d_button_proc, 50, 255, 220, 25, 255, 0, 0, D_EXIT, 0, 0, (void *)"Change Team #", NULL, NULL }, ! { d_button_proc, 50, 285, 220, 25, 255, 0, 0, D_EXIT, 0, 0, (void *)"Change Config #", NULL, NULL }, ! { d_button_proc, 50, 315, 220, 25, 255, 0, 0, D_EXIT, 0, 0, (void *)"Edit Config", NULL, NULL }, ! { d_button_proc, 50, 345, 220, 25, 255, 0, 0, D_EXIT, 0, 0, (void *)"Edit Fleet", NULL, NULL }, { d_button_proc, 90, 380, 220, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Main Menu", NULL, NULL }, { d_tw_yield_proc, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, --- 1113,1121 ---- { d_list_proc, 290, 70, 160, 160, 255, 0, 0, D_EXIT, 0, 0, (void *)controlListboxGetter, NULL, NULL }, { d_check_proc, 100, 236, 120, 20, 255, 0, 0, 0, 1, 0, (void *)"Teams in Net Games", NULL, NULL }, ! { my_d_button_proc, 295, 240, 150, 20, 255, 0, 0, D_EXIT, 0, 0, (void *)"Select Controller", NULL, NULL }, ! { my_d_button_proc, 50, 255, 220, 25, 255, 0, 0, D_EXIT, 0, 0, (void *)"Change Team #", NULL, NULL }, ! { my_d_button_proc, 50, 285, 220, 25, 255, 0, 0, D_EXIT, 0, 0, (void *)"Change Config #", NULL, NULL }, ! { my_d_button_proc, 50, 315, 220, 25, 255, 0, 0, D_EXIT, 0, 0, (void *)"Edit Config", NULL, NULL }, ! { my_d_button_proc, 50, 345, 220, 25, 255, 0, 0, D_EXIT, 0, 0, (void *)"Edit Fleet", NULL, NULL }, { d_button_proc, 90, 380, 220, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Main Menu", NULL, NULL }, { d_tw_yield_proc, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, *************** *** 1287,1296 **** // (dialog proc) (x) (y) (w) (h) (fg) (bg) (key) (flags) (d1) (d2) (dp) ! { d_button_proc, 390, 10, 240, 20, 255, 0, 0,D_EXIT, 0, 0, (void *)"Player 1 Fleet", NULL, NULL },//FLEET_DIALOG_PLAYER_FLEET_BUTTON ! { d_button_proc, 390, 40, 128, 20, 255, 0, 0,D_EXIT, 0, 0, (void *)"Fleet Title", NULL, NULL },//FLEET_DIALOG_PLAYER_FLEET_TITLE ! { d_button_proc, 518, 40, 56, 20, 255, 0, 0,D_EXIT, 0, 0, (void *)"Save", NULL, NULL },//FLEET_DIALOG_SAVE_BUTTON ! { d_button_proc, 574, 40, 56, 20, 255, 0, 0,D_EXIT, 0, 0, (void *)"Load", NULL, NULL },//FLEET_DIALOG_LOAD_BUTTON { d_textbox_proc, 390, 60, 128, 20, 255, 0, 0, 0, 0, 0, (void *)"Point Limit", NULL, NULL },//FLEET_DIALOG_POINT_LIMIT_TEXT ! { d_button_proc, 518, 60, 112, 20, 255, 0, 0,D_EXIT, 0, 0, (void *)"300\0 ", NULL, NULL },//FLEET_DIALOG_POINT_LIMIT_BUTTON { d_textbox_proc, 390, 80, 128, 20, 255, 0, 0, 0, 0, 0, (void *)"Current Points", NULL, NULL },//FLEET_DIALOG_CURRENT_POINTS_TEXT { d_textbox_proc, 518, 80, 112, 20, 255, 0, 0, 0, 0, 0, (void *)"100\0 ", NULL, NULL },//FLEET_DIALOG_CURRENT_POINTS_VALUE --- 1317,1326 ---- // (dialog proc) (x) (y) (w) (h) (fg) (bg) (key) (flags) (d1) (d2) (dp) ! { my_d_button_proc, 390, 10, 240, 20, 255, 0, 0,D_EXIT, 0, 0, (void *)"Player 1 Fleet", NULL, NULL },//FLEET_DIALOG_PLAYER_FLEET_BUTTON ! { my_d_button_proc, 390, 40, 128, 20, 255, 0, 0,D_EXIT, 0, 0, (void *)"Fleet Title", NULL, NULL },//FLEET_DIALOG_PLAYER_FLEET_TITLE ! { my_d_button_proc, 518, 40, 56, 20, 255, 0, 0,D_EXIT, 0, 0, (void *)"Save", NULL, NULL },//FLEET_DIALOG_SAVE_BUTTON ! { my_d_button_proc, 574, 40, 56, 20, 255, 0, 0,D_EXIT, 0, 0, (void *)"Load", NULL, NULL },//FLEET_DIALOG_LOAD_BUTTON { d_textbox_proc, 390, 60, 128, 20, 255, 0, 0, 0, 0, 0, (void *)"Point Limit", NULL, NULL },//FLEET_DIALOG_POINT_LIMIT_TEXT ! { my_d_button_proc, 518, 60, 112, 20, 255, 0, 0,D_EXIT, 0, 0, (void *)"300\0 ", NULL, NULL },//FLEET_DIALOG_POINT_LIMIT_BUTTON { d_textbox_proc, 390, 80, 128, 20, 255, 0, 0, 0, 0, 0, (void *)"Current Points", NULL, NULL },//FLEET_DIALOG_CURRENT_POINTS_TEXT { d_textbox_proc, 518, 80, 112, 20, 255, 0, 0, 0, 0, 0, (void *)"100\0 ", NULL, NULL },//FLEET_DIALOG_CURRENT_POINTS_VALUE *************** *** 1300,1307 **** // (dialog proc) (x) (y) (w) (h) (fg) (bg) (key) (flags) (d1) (d2) (dp) ! { d_button_proc, 270, 210, 100, 25, 255, 0, 0,D_EXIT, 0, 0, (void *)"Add", NULL, NULL },//FLEET_DIALOG_ADD_BUTTON ! { d_button_proc, 270, 235, 100, 25, 255, 0, 0,D_EXIT, 0, 0, (void *)"Add All", NULL, NULL },//FLEET_DIALOG_ADD_ALL_BUTTON ! { d_button_proc, 270, 265, 100, 25, 255, 0, 0,D_EXIT, 0, 0, (void *)"Remove", NULL, NULL },//FLEET_DIALOG_CLEAR ! { d_button_proc, 270, 290, 100, 25, 255, 0, 0,D_EXIT, 0, 0, (void *)"Remove All", NULL, NULL },//FLEET_DIALOG_CLEARALL { scp_fleet_dialog_bitmap_proc, 10, 372, 85, 85, 255, 0, 0, 0, 0, 0, (void *)NULL, NULL, NULL },//FLEET_DIALOG_SHIP_PICTURE_BITMAP --- 1330,1337 ---- // (dialog proc) (x) (y) (w) (h) (fg) (bg) (key) (flags) (d1) (d2) (dp) ! { my_d_button_proc, 270, 210, 100, 25, 255, 0, 0,D_EXIT, 0, 0, (void *)"Add", NULL, NULL },//FLEET_DIALOG_ADD_BUTTON ! { my_d_button_proc, 270, 235, 100, 25, 255, 0, 0,D_EXIT, 0, 0, (void *)"Add All", NULL, NULL },//FLEET_DIALOG_ADD_ALL_BUTTON ! { my_d_button_proc, 270, 265, 100, 25, 255, 0, 0,D_EXIT, 0, 0, (void *)"Remove", NULL, NULL },//FLEET_DIALOG_CLEAR ! { my_d_button_proc, 270, 290, 100, 25, 255, 0, 0,D_EXIT, 0, 0, (void *)"Remove All", NULL, NULL },//FLEET_DIALOG_CLEARALL { scp_fleet_dialog_bitmap_proc, 10, 372, 85, 85, 255, 0, 0, 0, 0, 0, (void *)NULL, NULL, NULL },//FLEET_DIALOG_SHIP_PICTURE_BITMAP *************** *** 1556,1563 **** - //int lastFleetItemShown = 0; - - //extern void _handle_scrollable_scroll(DIALOG *d, int listsize, int *index, int *offset); - int scp_fleet_dialog_text_list_proc(int msg, DIALOG* d, int c) { --- 1586,1589 ---- *************** *** 1782,1787 **** // (dialog proc) (x) (y) (w) (h) (fg) (bg) (key) (flags) (d1) (d2) (dp) { d_textbox_proc, 5, 5, 220, 40, 255, 0, 0, 0, 0, 0, (void *)"Select a ship to examine", NULL, NULL }, ! { d_button_proc, 300, 5, 120, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Done", NULL, NULL }, ! { d_button_proc, 300, 45, 120, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Font Size", NULL, NULL }, { d_list_proc2, 430, 5, 120, 60, 255, 0, 0, D_EXIT, 0, 0, (void *) genericListboxGetter, NULL, sorttypes }, { d_list_proc2, 5, 50, 220, 420, 255, 0, 0, D_EXIT, 0, 0, (void *) fleetListboxGetter, NULL, NULL }, --- 1808,1813 ---- // (dialog proc) (x) (y) (w) (h) (fg) (bg) (key) (flags) (d1) (d2) (dp) { d_textbox_proc, 5, 5, 220, 40, 255, 0, 0, 0, 0, 0, (void *)"Select a ship to examine", NULL, NULL }, ! { my_d_button_proc, 300, 5, 120, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Done", NULL, NULL }, ! { my_d_button_proc, 300, 45, 120, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Font Size", NULL, NULL }, { d_list_proc2, 430, 5, 120, 60, 255, 0, 0, D_EXIT, 0, 0, (void *) genericListboxGetter, NULL, sorttypes }, { d_list_proc2, 5, 50, 220, 420, 255, 0, 0, D_EXIT, 0, 0, (void *) fleetListboxGetter, NULL, NULL }, Index: scp.h =================================================================== RCS file: /cvsroot/timewarp/source/scp.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** scp.h 10 Jan 2004 22:27:58 -0000 1.6 --- scp.h 4 Feb 2004 10:36:28 -0000 1.7 *************** *** 11,13 **** --- 11,18 ---- void ship_view_dialog(int si = 0, class Fleet *fleet = NULL); + extern SAMPLE * menuAccept; + extern SAMPLE * menuFocus; + extern SAMPLE * menuDisabled; + extern SAMPLE * menuSpecial; + #endif // __SCP_H__ |
|
From: <you...@us...> - 2004-02-04 10:38:50
|
Update of /cvsroot/timewarp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15114 Modified Files: TitleScreen.dat Log Message: made most buttons make standard SC sounds; added SC sounds to TitleScreen.dat; added my_d_button_proc to handle buttons |
|
From: <you...@us...> - 2004-02-04 10:38:49
|
Update of /cvsroot/timewarp/source/ais In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15114/source/ais Modified Files: c_input.cpp Log Message: made most buttons make standard SC sounds; added SC sounds to TitleScreen.dat; added my_d_button_proc to handle buttons Index: c_input.cpp =================================================================== RCS file: /cvsroot/timewarp/source/ais/c_input.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** c_input.cpp 29 Jan 2004 21:20:27 -0000 1.8 --- c_input.cpp 4 Feb 2004 10:36:27 -0000 1.9 *************** *** 21,24 **** --- 21,25 ---- #include "../ais.h" #include "../melee/mship.h" + #include "../gui.h" *************** *** 34,40 **** { d_box_proc, 40, 40, 200, 250, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, { d_textbox_proc, 50, 50, 180, 30, 255, 0, 0, 0, 0, 0, (char*)"Joystick Calibration", NULL, NULL }, ! { d_button_proc, 50, 100, 180, 30, 255, 0, 0, D_EXIT, 0, 0, dialog_string[0], NULL, NULL }, ! { d_button_proc, 50, 140, 100, 30, 255, 0, 0, D_EXIT, 0, 0, (char*)"Next Joystick", NULL, NULL }, ! { d_button_proc, 160, 140, 70, 30, 255, 0, 0, D_EXIT, 0, 0, (char*)"Done", NULL, NULL }, { d_textbox_proc, 50, 180, 180, 100, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, { d_tw_yield_proc, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, --- 35,41 ---- { d_box_proc, 40, 40, 200, 250, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, { d_textbox_proc, 50, 50, 180, 30, 255, 0, 0, 0, 0, 0, (char*)"Joystick Calibration", NULL, NULL }, ! { my_d_button_proc, 50, 100, 180, 30, 255, 0, 0, D_EXIT, 0, 0, dialog_string[0], NULL, NULL }, ! { my_d_button_proc, 50, 140, 100, 30, 255, 0, 0, D_EXIT, 0, 0, (char*)"Next Joystick", NULL, NULL }, ! { my_d_button_proc, 160, 140, 70, 30, 255, 0, 0, D_EXIT, 0, 0, (char*)"Done", NULL, NULL }, { d_textbox_proc, 50, 180, 180, 100, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, { d_tw_yield_proc, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, *************** *** 191,214 **** // (dialog proc) (x) (y) (w) (h) (fg) (bg) (key) (flags) (d1) (d2) (dp) { d_textbox_proc, 0, 0, 160, 80, 255, 0, 0, 0, 0, 0, dialog_string[0], NULL, NULL }, ! { d_button_proc, 60, 90, 500, 25, 255, 0, 0, D_EXIT, 0, 0, dialog_string[1], NULL, NULL }, ! { d_button_proc, 60, 120, 500, 25, 255, 0, 0, D_EXIT, 0, 0, dialog_string[2], NULL, NULL }, ! { d_button_proc, 60, 150, 500, 25, 255, 0, 0, D_EXIT, 0, 0, dialog_string[3], NULL, NULL }, ! { d_button_proc, 60, 180, 500, 25, 255, 0, 0, D_EXIT, 0, 0, dialog_string[4], NULL, NULL }, ! { d_button_proc, 60, 210, 500, 25, 255, 0, 0, D_EXIT, 0, 0, dialog_string[5], NULL, NULL }, ! { d_button_proc, 60, 240, 500, 25, 255, 0, 0, D_EXIT, 0, 0, dialog_string[6], NULL, NULL }, ! { d_button_proc, 60, 270, 500, 25, 255, 0, 0, D_EXIT, 0, 0, dialog_string[7], NULL, NULL }, ! { d_button_proc, 60, 300, 500, 25, 255, 0, 0, D_EXIT, 0, 0, dialog_string[8], NULL, NULL }, ! { d_button_proc, 60, 330, 500, 25, 255, 0, 0, D_EXIT, 0, 0, dialog_string[9], NULL, NULL }, ! { d_button_proc, 60, 360, 500, 15, 255, 0, 0, D_EXIT, 0, 0, dialog_string[10], NULL, NULL }, ! { d_button_proc, 60, 375, 500, 15, 255, 0, 0, D_EXIT, 0, 0, dialog_string[11], NULL, NULL }, ! { d_button_proc, 60, 390, 500, 15, 255, 0, 0, D_EXIT, 0, 0, dialog_string[12], NULL, NULL }, ! { d_button_proc, 60, 405, 500, 15, 255, 0, 0, D_EXIT, 0, 0, dialog_string[13], NULL, NULL }, ! { d_button_proc, 60, 420, 500, 15, 255, 0, 0, D_EXIT, 0, 0, dialog_string[14], NULL, NULL }, ! { d_button_proc, 60, 435, 500, 15, 255, 0, 0, D_EXIT, 0, 0, dialog_string[15], NULL, NULL }, ! { d_button_proc, 60, 450, 500, 15, 255, 0, 0, D_EXIT, 0, 0, dialog_string[16], NULL, NULL }, ! { d_button_proc, 180, 20, 180, 25, 255, 0, 0, D_EXIT, 0, 0, (void*)"Accept Changes", NULL, NULL }, { d_button_proc, 180, 50, 180, 25, 255, 0, 0, D_EXIT, 0, 0, (void*)"Cancel", NULL, NULL }, ! { d_button_proc, 360, 35, 200, 25, 255, 0, 0, D_EXIT, 0, 0, (void*)"Calibrate Joysticks", NULL, NULL }, { d_tw_yield_proc, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, { NULL, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL } --- 192,215 ---- // (dialog proc) (x) (y) (w) (h) (fg) (bg) (key) (flags) (d1) (d2) (dp) { d_textbox_proc, 0, 0, 160, 80, 255, 0, 0, 0, 0, 0, dialog_string[0], NULL, NULL }, ! { my_d_button_proc, 60, 90, 500, 25, 255, 0, 0, D_EXIT, 0, 0, dialog_string[1], NULL, NULL }, ! { my_d_button_proc, 60, 120, 500, 25, 255, 0, 0, D_EXIT, 0, 0, dialog_string[2], NULL, NULL }, ! { my_d_button_proc, 60, 150, 500, 25, 255, 0, 0, D_EXIT, 0, 0, dialog_string[3], NULL, NULL }, ! { my_d_button_proc, 60, 180, 500, 25, 255, 0, 0, D_EXIT, 0, 0, dialog_string[4], NULL, NULL }, ! { my_d_button_proc, 60, 210, 500, 25, 255, 0, 0, D_EXIT, 0, 0, dialog_string[5], NULL, NULL }, ! { my_d_button_proc, 60, 240, 500, 25, 255, 0, 0, D_EXIT, 0, 0, dialog_string[6], NULL, NULL }, ! { my_d_button_proc, 60, 270, 500, 25, 255, 0, 0, D_EXIT, 0, 0, dialog_string[7], NULL, NULL }, ! { my_d_button_proc, 60, 300, 500, 25, 255, 0, 0, D_EXIT, 0, 0, dialog_string[8], NULL, NULL }, ! { my_d_button_proc, 60, 330, 500, 25, 255, 0, 0, D_EXIT, 0, 0, dialog_string[9], NULL, NULL }, ! { my_d_button_proc, 60, 360, 500, 15, 255, 0, 0, D_EXIT, 0, 0, dialog_string[10], NULL, NULL }, ! { my_d_button_proc, 60, 375, 500, 15, 255, 0, 0, D_EXIT, 0, 0, dialog_string[11], NULL, NULL }, ! { my_d_button_proc, 60, 390, 500, 15, 255, 0, 0, D_EXIT, 0, 0, dialog_string[12], NULL, NULL }, ! { my_d_button_proc, 60, 405, 500, 15, 255, 0, 0, D_EXIT, 0, 0, dialog_string[13], NULL, NULL }, ! { my_d_button_proc, 60, 420, 500, 15, 255, 0, 0, D_EXIT, 0, 0, dialog_string[14], NULL, NULL }, ! { my_d_button_proc, 60, 435, 500, 15, 255, 0, 0, D_EXIT, 0, 0, dialog_string[15], NULL, NULL }, ! { my_d_button_proc, 60, 450, 500, 15, 255, 0, 0, D_EXIT, 0, 0, dialog_string[16], NULL, NULL }, ! { my_d_button_proc, 180, 20, 180, 25, 255, 0, 0, D_EXIT, 0, 0, (void*)"Accept Changes", NULL, NULL }, { d_button_proc, 180, 50, 180, 25, 255, 0, 0, D_EXIT, 0, 0, (void*)"Cancel", NULL, NULL }, ! { my_d_button_proc, 360, 35, 200, 25, 255, 0, 0, D_EXIT, 0, 0, (void*)"Calibrate Joysticks", NULL, NULL }, { d_tw_yield_proc, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, { NULL, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL } |
|
From: <you...@us...> - 2004-02-04 10:38:48
|
Update of /cvsroot/timewarp/source/games In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15114/source/games Modified Files: ggob.cpp Log Message: made most buttons make standard SC sounds; added SC sounds to TitleScreen.dat; added my_d_button_proc to handle buttons Index: ggob.cpp =================================================================== RCS file: /cvsroot/timewarp/source/games/ggob.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** ggob.cpp 29 Jan 2004 21:20:27 -0000 1.21 --- ggob.cpp 4 Feb 2004 10:36:27 -0000 1.22 *************** *** 26,29 **** --- 26,30 ---- #include "../melee/manim.h" #include "../melee/mfleet.h" + #include "../gui.h" #include "../util/aastr.h" *************** *** 786,793 **** {// (dialog proc) (x) (y) (w) (h) (fg) (bg) (key) (flags) (d1) (d2) (dp) { d_button_proc, 385, 50, 150, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Depart Station" , NULL, NULL }, ! { d_button_proc, 385, 90, 150, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Upgrade Ship" , NULL, NULL }, ! { d_button_proc, 385, 130, 150, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Buy New Ship" , NULL, NULL }, ! { d_button_proc, 385, 170, 150, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Repair Ship" , NULL, NULL }, ! { d_button_proc, 385, 210, 150, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Get Quest" , NULL, NULL }, { d_text_proc, 185, 420, 270, 30, 255, 0, 0, 0, 0, 0, dialog_string[0], NULL, NULL }, { d_tw_yield_proc, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, --- 787,794 ---- {// (dialog proc) (x) (y) (w) (h) (fg) (bg) (key) (flags) (d1) (d2) (dp) { d_button_proc, 385, 50, 150, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Depart Station" , NULL, NULL }, ! { my_d_button_proc, 385, 90, 150, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Upgrade Ship" , NULL, NULL }, ! { my_d_button_proc, 385, 130, 150, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Buy New Ship" , NULL, NULL }, ! { my_d_button_proc, 385, 170, 150, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Repair Ship" , NULL, NULL }, ! { my_d_button_proc, 385, 210, 150, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Get Quest" , NULL, NULL }, { d_text_proc, 185, 420, 270, 30, 255, 0, 0, 0, 0, 0, dialog_string[0], NULL, NULL }, { d_tw_yield_proc, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, *************** *** 943,947 **** static DIALOG upgrade_dialog[] = {// (dialog proc) (x) (y) (w) (h) (fg) (bg) (key) (flags) (d1) (d2) (dp) ! { d_button_proc, 10, 415, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Station menu" , NULL, NULL }, { d_textbox_proc, 20, 40, 250, 40, 255, 0, 0, D_EXIT, 0, 0, (void *)"Upgrade Menu", NULL, NULL }, { d_text_proc, 10, 100, 540, 20, 255, 0, 0, D_EXIT, 0, 0, (void *)" # Starbucks Buckazoids Description ", NULL, NULL }, --- 944,948 ---- static DIALOG upgrade_dialog[] = {// (dialog proc) (x) (y) (w) (h) (fg) (bg) (key) (flags) (d1) (d2) (dp) ! { my_d_button_proc, 10, 415, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Station menu" , NULL, NULL }, { d_textbox_proc, 20, 40, 250, 40, 255, 0, 0, D_EXIT, 0, 0, (void *)"Upgrade Menu", NULL, NULL }, { d_text_proc, 10, 100, 540, 20, 255, 0, 0, D_EXIT, 0, 0, (void *)" # Starbucks Buckazoids Description ", NULL, NULL }, |
|
From: <you...@us...> - 2004-02-04 07:38:55
|
Update of /cvsroot/timewarp/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17133/source Modified Files: scp.cpp Log Message: fixed bug where you could no longer use the arrow keys in that freaking fleet editor Index: scp.cpp =================================================================== RCS file: /cvsroot/timewarp/source/scp.cpp,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** scp.cpp 3 Feb 2004 13:21:30 -0000 1.41 --- scp.cpp 3 Feb 2004 22:07:07 -0000 1.42 *************** *** 335,338 **** --- 335,339 ---- } + void play_net1client ( const char *_address, int _port ) {STACKTRACE NetLog *log = new NetLog(); *************** *** 1583,1589 **** } } ! else { ! ret = d_text_list_proc( msg, d, c ); ! } if (shouldConsumeChar) --- 1584,1588 ---- } } ! ret = d_text_list_proc( msg, d, c ); if (shouldConsumeChar) |
|
From: <you...@us...> - 2004-02-04 07:34:34
|
Update of /cvsroot/timewarp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14332 Modified Files: TitleScreen.dat Log Message: added a logo to the loading screen. It should resize to fix any resolution, and respond to bit depths changes as needed. It even shows up in small resolutions like 320x240. |
|
From: <you...@us...> - 2004-02-04 07:34:34
|
Update of /cvsroot/timewarp/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14332/source Modified Files: scp.cpp Log Message: added a logo to the loading screen. It should resize to fix any resolution, and respond to bit depths changes as needed. It even shows up in small resolutions like 320x240. Index: scp.cpp =================================================================== RCS file: /cvsroot/timewarp/source/scp.cpp,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** scp.cpp 3 Feb 2004 22:07:07 -0000 1.42 --- scp.cpp 4 Feb 2004 07:32:09 -0000 1.43 *************** *** 39,42 **** --- 39,43 ---- #endif + DATAFILE *scppal = NULL; *************** *** 238,244 **** */ void showLoadingScreen() { acquire_screen(); clear_to_color(screen, palette_color[0]); ! const char * loadString = "Loading..."; textout_right(screen, font, loadString, --- 239,279 ---- */ void showLoadingScreen() { + static BITMAP * logo = NULL; + static int depth = bitmap_color_depth(screen); + acquire_screen(); clear_to_color(screen, palette_color[0]); ! ! if (NULL == logo || bitmap_color_depth(screen) != depth) ! { ! depth = bitmap_color_depth(screen); ! ! DATAFILE * data = load_datafile_object("TitleScreen.dat","LOGO"); ! if (data != NULL && data->type==DAT_BITMAP) { ! BITMAP * temp = (BITMAP*) data->dat; ! logo = create_bitmap(temp->w, temp->h); ! blit(temp, logo, 0,0, 0,0, temp->w, temp->h); ! unload_datafile_object(data); ! } ! } ! ! if (logo!=null) { ! if (screen->w/2 >= logo->w) { ! draw_sprite(screen, logo, screen->w/2 - logo->w/2, screen->h/2 - logo->h/2); ! } ! else { ! float ratio = logo->w / logo->h; ! ! int h = screen->h/4; ! int w = ratio * h; ! ! stretch_blit(logo, screen, ! 0,0, ! logo->w, logo->h, ! screen->w/2 - w/2, screen->h/2 - h/2, ! w, h); ! } ! } ! const char * loadString = "Loading..."; textout_right(screen, font, loadString, *************** *** 335,338 **** --- 370,383 ---- } + static DIALOG clientWaiting[] = + { + // (dialog proc) (x) (y) (w) (h) (fg) (bg) (key) (flags) (d1) (d2) (dp) + { d_box_proc, 120, 100, 300, 140, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, + { d_text_proc, 140, 110, 240, 25, 255, 0, 0, 0, 0, 0, (void*)"Connecting to ", NULL, NULL }, + { d_button_proc, 280, 200, 120, 30, 255, 0, 0, D_EXIT, 0, 0, (void*) "Cancel", NULL, NULL }, + { d_tw_yield_proc, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, + { NULL, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL } + }; + void play_net1client ( const char *_address, int _port ) {STACKTRACE *************** *** 494,506 **** if (gui_stuff) { prepareTitleScreenAssets(); - /*scp = load_datafile("scpgui.dat"); - - Music * mymusic = load_mod("test.dat#MYMUSIC"); - //Music * mymusic = load_mod("scpgui.dat#SCPMUSIC"); - if (!mymusic) - tw_error("Couldnt load title music");*/ - - - //sound.play_music((Music *)(scp[SCPGUI_MUSIC].dat), TRUE); showTitle(); } --- 539,542 ---- *************** *** 618,636 **** } - prepareTitleScreenAssets(); - - /*scp = load_datafile("scpgui.dat"); - if (!scp) - tw_error("Couldn't load scpgui.dat"); - //sound.play_music((Music *)(scp[SCPGUI_MUSIC].dat), TRUE); - - Music * mymusic = load_mod("TitleScreen.dat#MYMUSIC"); - //Music * mymusic = load_mod("scpgui.dat#MYMUSIC"); - if (!mymusic) - tw_error("Couldnt load title music"); - sound.play_music( mymusic, TRUE);*/ - - showTitle(); enable(); --- 654,658 ---- |
|
From: <you...@us...> - 2004-02-04 05:46:28
|
Update of /cvsroot/timewarp/gamedata In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14086/gamedata Modified Files: TestQuest.lua Log Message: adding PrintMessage to gquest; adding "Mission completed" message. Sorry, didn't mean to check in any of this GOB game stuff, but I accidently commited the .h and .cpp files already, so I may as well finish up my mistake and add the lua file change too :) Index: TestQuest.lua =================================================================== RCS file: /cvsroot/timewarp/gamedata/TestQuest.lua,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TestQuest.lua 19 Jan 2004 19:15:37 -0000 1.4 --- TestQuest.lua 3 Feb 2004 13:26:07 -0000 1.5 *************** *** 8,12 **** function GAME_EVENT_SHIP_DIE( Type ) if Type == "shosc" then shoscKilled = shoscKilled - 1 end ! if shoscKilled == 0 then Complited = 1 end end --- 8,12 ---- function GAME_EVENT_SHIP_DIE( Type ) if Type == "shosc" then shoscKilled = shoscKilled - 1 end ! if shoscKilled == 0 then Complited = 1; PrintMessage("Mission Completed."); end end |
|
From: <you...@us...> - 2004-02-03 06:48:28
|
Update of /cvsroot/timewarp/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13001/docs Modified Files: Interface.txt Log Message: removing extra newlines in a doc Index: Interface.txt =================================================================== RCS file: /cvsroot/timewarp/docs/Interface.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Interface.txt 11 Nov 2003 04:38:18 -0000 1.6 --- Interface.txt 3 Feb 2004 06:46:19 -0000 1.7 *************** *** 1,520 **** ! This doc describes a potential menu interface for TW. ! Revision history: ! 2003.10.14 youbastrd started ! 2003.10.29 youbastrd continuing after a hiatus ! 2003.11.03 youbastrd testing wacky new commit mailing list... should work now ! ! ************************************************************************* ! Goals - What do users want to do inside this game? ********************** ! ************************************************************************* ! [...1011 lines suppressed...] ! .............................................................................. ! .............................................................................. ! .............................................................................. ! .............................................................................. ! .............................................................................. ! .............................................................................. ! .............................................................................. ! .............................................................................. ! .............................................................................. ! .............................................................................. ! .............................................................................. ! .............................................................................. ! .............................................................................. ! .............................................................................. ! .............................................................................. ! . Help Text (changes to reflect the current selection) .. ! ! ESC goes back to previous ! ! |
|
From: <you...@us...> - 2004-02-03 06:48:03
|
Update of /cvsroot/timewarp/source/melee In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12490/source/melee Modified Files: mfleet.h Log Message: fix for bug 31 (forgot to remove a hack, should fix a link errors) Index: mfleet.h =================================================================== RCS file: /cvsroot/timewarp/source/melee/mfleet.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** mfleet.h 1 Feb 2004 08:35:15 -0000 1.15 --- mfleet.h 3 Feb 2004 06:45:48 -0000 1.16 *************** *** 12,16 **** - extern int lastFleetItemShown; //TODO get rid of global variables used by this function; remove this function --- 12,15 ---- |
|
From: <you...@us...> - 2004-02-03 06:45:10
|
Update of /cvsroot/timewarp/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10241/source Modified Files: scp.cpp Log Message: made the ship prevew in fleet editor rotate to the same angle the previously selected ship had rotated to (bug 42) Index: scp.cpp =================================================================== RCS file: /cvsroot/timewarp/source/scp.cpp,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** scp.cpp 3 Feb 2004 06:20:00 -0000 1.39 --- scp.cpp 3 Feb 2004 06:43:01 -0000 1.40 *************** *** 1588,1601 **** if (d->d1 != old_d1) { safeToDrawPreview = false; {ShipType* type = reference_fleet->getShipType(old_d1); ! if (type && type->data) ! type->data->unlock();} ! {ShipType* type = reference_fleet->getShipType(d->d1); ! if (type && type->data) ! type->data->lock();} rotationFrame = 0; } --- 1588,1614 ---- if (d->d1 != old_d1) { safeToDrawPreview = false; + float fractionRotated = 0; {ShipType* type = reference_fleet->getShipType(old_d1); ! ! if (type && type->data) { ! if (type->data->spriteShip) { ! float r = rotationFrame; ! float s = type->data->spriteShip->frames(); ! float t = r / s; ! fractionRotated = (float)((float)rotationFrame / (float)(type->data->spriteShip->frames())); ! } ! type->data->unlock(); ! }} rotationFrame = 0; + + {ShipType* type = reference_fleet->getShipType(d->d1); + if (type && type->data) { + type->data->lock(); + if (type->data->spriteShip) + rotationFrame = (int)(fractionRotated * type->data->spriteShip->frames()); + }} } |
|
From: <you...@us...> - 2004-02-03 06:22:10
|
Update of /cvsroot/timewarp/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24016/source Modified Files: gui.cpp scp.cpp Log Message: fixing scrolling in fleet editor when a key is used to select a ship by name (bug31) Index: gui.cpp =================================================================== RCS file: /cvsroot/timewarp/source/gui.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** gui.cpp 1 Feb 2004 08:35:15 -0000 1.12 --- gui.cpp 3 Feb 2004 06:20:00 -0000 1.13 *************** *** 660,664 **** */ ! /* --- 660,664 ---- */ ! /* *************** *** 739,743 **** return NULL; } else { - lastFleetItemShown = index; ShipType * type = reference_fleet->getShipType(index); sprintf(buffy, "%3d %s", type->cost, type->name); --- 739,742 ---- Index: scp.cpp =================================================================== RCS file: /cvsroot/timewarp/source/scp.cpp,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** scp.cpp 1 Feb 2004 08:35:15 -0000 1.38 --- scp.cpp 3 Feb 2004 06:20:00 -0000 1.39 *************** *** 1245,1248 **** --- 1245,1251 ---- { scp_fleet_dialog_text_list_proc, 10, 141, 240, 227, 255, 0, 0,D_EXIT, 0, 0, (void *)shippointsListboxGetter, NULL, NULL },//FLEET_DIALOG_AVAILABLE_SHIPS_LIST + + //{ d_text_list_proc, + // 10, 141, 240, 227, 255, 0, 0,D_EXIT, 0, 0, (void *)shippointsListboxGetter, NULL, NULL },//FLEET_DIALOG_AVAILABLE_SHIPS_LIST { d_list_proc2, 390, 141, 240, 227, 255, 0, 0,D_EXIT, 0, 0, (void *)fleetpointsListboxGetter, NULL, NULL },//FLEET_DIALOG_FLEET_SHIPS_LIST *************** *** 1517,1526 **** ! int lastFleetItemShown = 0; int scp_fleet_dialog_text_list_proc(int msg, DIALOG* d, int c) { static int next_anim_time = get_time(); int old_d1 = d->d1; int old_d2 = d->d2; --- 1520,1533 ---- ! //int lastFleetItemShown = 0; ! ! //extern void _handle_scrollable_scroll(DIALOG *d, int listsize, int *index, int *offset); int scp_fleet_dialog_text_list_proc(int msg, DIALOG* d, int c) { + static int next_anim_time = get_time(); int old_d1 = d->d1; int old_d2 = d->d2; + int ret = 0; *************** *** 1534,1561 **** shouldConsumeChar = true; if (d->d1 != old_d1) { d->flags = D_DIRTY; ! /*int size = lastFleetItemShown - old_d1; ! ! if (size > reference_fleet->getSize() { ! ! if ( ! (d->d2 + size > d->d1) ! ) ! { ! //d->d2 = d->d1; ! d->d2 = d->d1 - size/2; } ! }*/ } } } - int ret = d_text_list_proc( msg, d, c ); - if (shouldConsumeChar) ret = D_USED_CHAR; - static BITMAP* panel = create_bitmap(fleetDialog[FLEET_DIALOG_SHIP_PICTURE_BITMAP].w, fleetDialog[FLEET_DIALOG_SHIP_PICTURE_BITMAP].h); --- 1541,1580 ---- shouldConsumeChar = true; if (d->d1 != old_d1) { + + int size = reference_fleet->getSize(); + int height = (d->h-4) / text_height(font); + + ret = D_USED_CHAR; d->flags = D_DIRTY; ! //scroll such that the selection is shown. ! //only change the scroll if the selection is not already shown, ! //and the number of ships in the list is greater than the number ! //of slots that can be shown simultaneously. ! if ( (size > height) && ! ( (d->d1 < d->d2) || ! (d->d1 >= d->d2 + height))) ! { ! if (d->d1 <= (height/2)) ! d->d2 = 0; ! else { ! ! if (d->d1 >= (size - height)) ! d->d2 = (size - height); ! else { ! d->d2 = d->d1 - height/2; ! } } ! } } } } + else { + ret = d_text_list_proc( msg, d, c ); + } if (shouldConsumeChar) ret = D_USED_CHAR; static BITMAP* panel = create_bitmap(fleetDialog[FLEET_DIALOG_SHIP_PICTURE_BITMAP].w, fleetDialog[FLEET_DIALOG_SHIP_PICTURE_BITMAP].h); |
|
From: <you...@pr...> - 2004-02-01 10:45:07
|
Update of /cvsroot/timewarp/source/melee In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7286/source/melee Modified Files: mfleet.cpp mfleet.h Log Message: make keys scroll to appropriate letter in fleet editor lists (bug 31); still doesn't scroll correctly Index: mfleet.cpp =================================================================== RCS file: /cvsroot/timewarp/source/melee/mfleet.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** mfleet.cpp 29 Jan 2004 21:20:29 -0000 1.20 --- mfleet.cpp 1 Feb 2004 08:35:15 -0000 1.21 *************** *** 479,480 **** --- 479,509 ---- } } + + int Fleet::getNextFleetEntryByCharacter(int currentShip, char c) { + + ASSERT(ships.at(currentShip) != null); + ASSERT(currentShip < ships.size()); + ASSERT(currentShip >=0); + c = toupper(c); + + for (int i=currentShip+1; i<ships.size(); i++) { + MyFleetShipType temp = ships.at(i); + ASSERT(temp!=NULL); + ASSERT(temp->name != NULL); + + if (toupper(temp->name[0]) == c) { + return i; + } + } + + for (i=0; i<currentShip; i++) { + MyFleetShipType temp = ships.at(i); + ASSERT(temp!=NULL); + ASSERT(temp->name != NULL); + + if (temp->name[0] == c) { + return i; + } + } + return currentShip; + } Index: mfleet.h =================================================================== RCS file: /cvsroot/timewarp/source/melee/mfleet.h,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** mfleet.h 29 Jan 2004 21:20:29 -0000 1.14 --- mfleet.h 1 Feb 2004 08:35:15 -0000 1.15 *************** *** 12,15 **** --- 12,16 ---- + extern int lastFleetItemShown; //TODO get rid of global variables used by this function; remove this function *************** *** 235,238 **** --- 236,251 ---- FleetCost getMaxCost() { return maxFleetCost; } + /** @brief returns the next entry in the fleet with name starting with the given character. + returns the next entry in the fleet with name starting with the given character. The ship + returned will be relative to currentShip. It will be either the next ship past currentShip + with name starting with c, or it will return currentShip if there's no such animal. Seaching + will start at currentShip, and if necessary, cylce past the end of the list back to the begining. + @param currentShip the index of the ship to start searching from. + @param c the character to search for + @return the index of the ship whose name starts with c, and is next in the list, + relative to currentShip. + */ + int getNextFleetEntryByCharacter(int currentShip, char c); + |
|
From: <you...@pr...> - 2004-02-01 10:41:15
|
Update of /cvsroot/timewarp/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7286/source Modified Files: gui.cpp scp.cpp Log Message: make keys scroll to appropriate letter in fleet editor lists (bug 31); still doesn't scroll correctly Index: gui.cpp =================================================================== RCS file: /cvsroot/timewarp/source/gui.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** gui.cpp 12 Dec 2003 00:17:05 -0000 1.11 --- gui.cpp 1 Feb 2004 08:35:15 -0000 1.12 *************** *** 731,734 **** --- 731,735 ---- else return "(none)"; } + char *shippointsListboxGetter(int index, int *list_size) { *************** *** 738,741 **** --- 739,743 ---- return NULL; } else { + lastFleetItemShown = index; ShipType * type = reference_fleet->getShipType(index); sprintf(buffy, "%3d %s", type->cost, type->name); Index: scp.cpp =================================================================== RCS file: /cvsroot/timewarp/source/scp.cpp,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** scp.cpp 29 Jan 2004 21:20:31 -0000 1.37 --- scp.cpp 1 Feb 2004 08:35:15 -0000 1.38 *************** *** 1516,1523 **** } int scp_fleet_dialog_text_list_proc(int msg, DIALOG* d, int c) { static int next_anim_time = get_time(); int old_d1 = d->d1; ! int ret = d_text_list_proc( msg, d, c ); static BITMAP* panel = create_bitmap(fleetDialog[FLEET_DIALOG_SHIP_PICTURE_BITMAP].w, --- 1516,1560 ---- } + + int lastFleetItemShown = 0; + int scp_fleet_dialog_text_list_proc(int msg, DIALOG* d, int c) { static int next_anim_time = get_time(); int old_d1 = d->d1; ! int old_d2 = d->d2; ! ! ! // allow user to select the ships based on keystrokes: ! // select based on the ship's name ! bool shouldConsumeChar = false; ! if (msg == MSG_CHAR) { ! char typed = (char)(0xff & c); ! if (isalnum (typed)) { ! d->d1 = reference_fleet->getNextFleetEntryByCharacter( d->d1, typed); ! shouldConsumeChar = true; ! if (d->d1 != old_d1) { ! d->flags = D_DIRTY; ! ! /*int size = lastFleetItemShown - old_d1; ! ! if (size > reference_fleet->getSize() { ! ! if ( ! (d->d2 + size > d->d1) ! ) ! { ! //d->d2 = d->d1; ! d->d2 = d->d1 - size/2; ! } ! }*/ ! } ! } ! } ! ! int ret = d_text_list_proc( msg, d, c ); ! ! if (shouldConsumeChar) ! ret = D_USED_CHAR; ! static BITMAP* panel = create_bitmap(fleetDialog[FLEET_DIALOG_SHIP_PICTURE_BITMAP].w, |
|
From: <or...@pr...> - 2004-01-31 20:48:29
|
Update of /cvsroot/timewarp/source/melee In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24073/source/melee Modified Files: manim.cpp Log Message: fixed strangeness that recently appeared in Animation::calculate() Index: manim.cpp =================================================================== RCS file: /cvsroot/timewarp/source/melee/manim.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** manim.cpp 29 Jan 2004 21:20:29 -0000 1.7 --- manim.cpp 31 Jan 2004 20:46:44 -0000 1.8 *************** *** 37,46 **** STACKTRACE; - if (!(ship && ship->exists())) - { - state = 0; - return; - } - frame_step -= frame_time; while (frame_step < 0) { --- 37,40 ---- |
|
From: <or...@pr...> - 2004-01-31 10:23:56
|
Update of /cvsroot/timewarp/source/ais In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3322/source/ais Modified Files: c_input.cpp c_other.cpp c_wussie.cpp Log Message: fixed project files, removed include paths, removed second gup.h, and #ifdefed scp.cpps dependancy upon gamex stuff Index: c_input.cpp =================================================================== RCS file: /cvsroot/timewarp/source/ais/c_input.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** c_input.cpp 13 Jan 2004 01:15:23 -0000 1.7 --- c_input.cpp 29 Jan 2004 21:20:27 -0000 1.8 *************** *** 16,24 **** #include <stdio.h> #include <string.h> ! #include <allegro.h> ! #include "melee.h" REGISTER_FILE ! #include "ais.h" ! #include "melee/mship.h" --- 16,24 ---- #include <stdio.h> #include <string.h> ! //#include <allegro.h> ! #include "../melee.h" REGISTER_FILE ! #include "../ais.h" ! #include "../melee/mship.h" Index: c_other.cpp =================================================================== RCS file: /cvsroot/timewarp/source/ais/c_other.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** c_other.cpp 13 Jan 2004 01:15:23 -0000 1.7 --- c_other.cpp 29 Jan 2004 21:20:27 -0000 1.8 *************** *** 1,3 **** ! #include "ais.h" REGISTER_FILE --- 1,3 ---- ! #include "../ais.h" REGISTER_FILE Index: c_wussie.cpp =================================================================== RCS file: /cvsroot/timewarp/source/ais/c_wussie.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** c_wussie.cpp 13 Jan 2004 01:15:23 -0000 1.10 --- c_wussie.cpp 29 Jan 2004 21:20:27 -0000 1.11 *************** *** 3,12 **** #include <allegro.h> ! #include "melee.h" ! #include "ais.h" ! #include "melee/mcontrol.h" ! #include "melee/mframe.h" ! #include "melee/mship.h" ! #include "melee/mmain.h" #define OPTION_UNKNOWN 0 --- 3,12 ---- #include <allegro.h> ! #include "../melee.h" ! #include "../ais.h" ! #include "../melee/mcontrol.h" ! #include "../melee/mframe.h" ! #include "../melee/mship.h" ! #include "../melee/mmain.h" #define OPTION_UNKNOWN 0 |
|
From: <or...@pr...> - 2004-01-31 06:01:52
|
Update of /cvsroot/timewarp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23678 Modified Files: code.txt Log Message: updated code.txt to remove the outdated warning about tw_error and tweak a few other details |
Update of /cvsroot/timewarp/source/twgui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3322/source/twgui Modified Files: gametest2.cpp gametest2.h twbutton.cpp twbuttontypes.cpp twgui.cpp twhelpers.cpp twmenuexamples.cpp twpopup.cpp twwindow.cpp utils.cpp Log Message: fixed project files, removed include paths, removed second gup.h, and #ifdefed scp.cpps dependancy upon gamex stuff Index: gametest2.cpp =================================================================== RCS file: /cvsroot/timewarp/source/twgui/gametest2.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** gametest2.cpp 13 Jan 2004 01:15:24 -0000 1.4 --- gametest2.cpp 29 Jan 2004 21:20:31 -0000 1.5 *************** *** 8,28 **** #include <string.h> ! #include "melee.h" REGISTER_FILE //#include "melee/mcbodies.h" //#include "melee/mship.h" //ships ! #include "melee/mlog.h" //networking / demo recording / demo playback ! #include "melee/mcontrol.h" //controllers & AIs ! #include "melee/mframe.h" ! #include "melee/mview.h" ! #include "melee/mshppan.h" //ship panels... ! #include "melee/mitems.h" //#include "melee/mfleet.h" //fleets... ! #include "melee/mcbodies.h" ! #include "scp.h" ! #include "util/history.h" #include "gametest2.h" --- 8,28 ---- #include <string.h> ! #include "../melee.h" REGISTER_FILE //#include "melee/mcbodies.h" //#include "melee/mship.h" //ships ! #include "../melee/mlog.h" //networking / demo recording / demo playback ! #include "../melee/mcontrol.h" //controllers & AIs ! #include "../melee/mframe.h" ! #include "../melee/mview.h" ! #include "../melee/mshppan.h" //ship panels... ! #include "../melee/mitems.h" //#include "melee/mfleet.h" //fleets... ! #include "../melee/mcbodies.h" ! #include "../scp.h" ! #include "../util/history.h" #include "gametest2.h" *************** *** 30,37 **** //#include "GamePlanetView.h" ! #include "scp.h" ! #include "melee/mfleet.h" ! #include "frame.h" #include "gamebuttonevent.h" --- 30,37 ---- //#include "GamePlanetView.h" ! #include "../scp.h" ! #include "../melee/mfleet.h" ! #include "../frame.h" #include "gamebuttonevent.h" Index: gametest2.h =================================================================== RCS file: /cvsroot/timewarp/source/twgui/gametest2.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** gametest2.h 13 Jan 2004 01:15:24 -0000 1.3 --- gametest2.h 29 Jan 2004 21:20:31 -0000 1.4 *************** *** 4,11 **** #include "twgui.h" ! #include "melee/mgame.h" ! #include "melee/mmain.h" ! #include "games/gflmelee.h" #include "twbutton.h" --- 4,11 ---- #include "twgui.h" ! #include "../melee/mgame.h" ! #include "../melee/mmain.h" ! #include "../games/gflmelee.h" #include "twbutton.h" Index: twbutton.cpp =================================================================== RCS file: /cvsroot/timewarp/source/twgui/twbutton.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** twbutton.cpp 17 Jan 2004 22:47:23 -0000 1.4 --- twbutton.cpp 29 Jan 2004 21:20:31 -0000 1.5 *************** *** 6,10 **** ! #include "melee.h" //#include "melee/mview.h" --- 6,10 ---- ! #include "../melee.h" //#include "melee/mview.h" Index: twbuttontypes.cpp =================================================================== RCS file: /cvsroot/timewarp/source/twgui/twbuttontypes.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** twbuttontypes.cpp 13 Jan 2004 01:15:24 -0000 1.5 --- twbuttontypes.cpp 29 Jan 2004 21:20:31 -0000 1.6 *************** *** 4,9 **** #include <string.h> ! #include "melee.h" ! #include "melee/mview.h" REGISTER_FILE --- 4,9 ---- #include <string.h> ! #include "../melee.h" ! #include "../melee/mview.h" REGISTER_FILE Index: twgui.cpp =================================================================== RCS file: /cvsroot/timewarp/source/twgui/twgui.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** twgui.cpp 17 Jan 2004 22:47:23 -0000 1.18 --- twgui.cpp 29 Jan 2004 21:20:31 -0000 1.19 *************** *** 7,12 **** #include <string.h> ! #include "melee.h" ! #include "melee/mview.h" REGISTER_FILE --- 7,12 ---- #include <string.h> ! #include "../melee.h" ! #include "../melee/mview.h" REGISTER_FILE Index: twhelpers.cpp =================================================================== RCS file: /cvsroot/timewarp/source/twgui/twhelpers.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** twhelpers.cpp 13 Jan 2004 01:15:25 -0000 1.3 --- twhelpers.cpp 29 Jan 2004 21:20:31 -0000 1.4 *************** *** 6,10 **** ! #include "melee.h" //#include "melee/mview.h" --- 6,10 ---- ! #include "../melee.h" //#include "melee/mview.h" Index: twmenuexamples.cpp =================================================================== RCS file: /cvsroot/timewarp/source/twgui/twmenuexamples.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** twmenuexamples.cpp 13 Jan 2004 01:15:25 -0000 1.3 --- twmenuexamples.cpp 29 Jan 2004 21:20:31 -0000 1.4 *************** *** 6,10 **** ! #include "melee.h" //#include "melee/mview.h" --- 6,10 ---- ! #include "../melee.h" //#include "melee/mview.h" Index: twpopup.cpp =================================================================== RCS file: /cvsroot/timewarp/source/twgui/twpopup.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** twpopup.cpp 13 Jan 2004 01:15:25 -0000 1.3 --- twpopup.cpp 29 Jan 2004 21:20:31 -0000 1.4 *************** *** 6,10 **** ! #include "melee.h" //#include "melee/mview.h" --- 6,10 ---- ! #include "../melee.h" //#include "melee/mview.h" Index: twwindow.cpp =================================================================== RCS file: /cvsroot/timewarp/source/twgui/twwindow.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** twwindow.cpp 13 Jan 2004 01:15:25 -0000 1.7 --- twwindow.cpp 29 Jan 2004 21:20:31 -0000 1.8 *************** *** 5,9 **** ! #include "melee.h" //#include "melee/mview.h" --- 5,9 ---- ! #include "../melee.h" //#include "melee/mview.h" Index: utils.cpp =================================================================== RCS file: /cvsroot/timewarp/source/twgui/utils.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** utils.cpp 13 Jan 2004 01:15:25 -0000 1.9 --- utils.cpp 29 Jan 2004 21:20:31 -0000 1.10 *************** *** 4,8 **** #include <string.h> ! #include "melee.h" #include "utils.h" --- 4,8 ---- #include <string.h> ! #include "../melee.h" #include "utils.h" |
Update of /cvsroot/timewarp/source/gamex In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3322/source/gamex Modified Files: ai_fleet.cpp ai_fleet.h ai_race.cpp gamedata.cpp gamedata.h gamedata_map.cpp gamedata_map.h gamedialogue.cpp gamedialogue.h gamegeneral.cpp gamegeneral.h gamehyper.cpp gamemelee.cpp gamemelee.h gameplanetscan.cpp gameplanetscan.h gameplanetview.cpp gameplanetview.h gameproject.cpp gameproject.h gamesolarview.cpp gamesolarview.h gamestarmap.cpp gamestarmap.h projectx.cpp Log Message: fixed project files, removed include paths, removed second gup.h, and #ifdefed scp.cpps dependancy upon gamex stuff Index: ai_fleet.cpp =================================================================== RCS file: /cvsroot/timewarp/source/gamex/ai_fleet.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ai_fleet.cpp 13 Jan 2004 01:15:22 -0000 1.3 --- ai_fleet.cpp 29 Jan 2004 21:20:28 -0000 1.4 *************** *** 3,7 **** #include <string.h> ! #include "melee.h" REGISTER_FILE --- 3,7 ---- #include <string.h> ! #include "../melee.h" REGISTER_FILE Index: ai_fleet.h =================================================================== RCS file: /cvsroot/timewarp/source/gamex/ai_fleet.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ai_fleet.h 13 Jan 2004 01:15:22 -0000 1.4 --- ai_fleet.h 29 Jan 2004 21:20:28 -0000 1.5 *************** *** 3,7 **** ! #include "ais.h" --- 3,7 ---- ! #include "../ais.h" Index: ai_race.cpp =================================================================== RCS file: /cvsroot/timewarp/source/gamex/ai_race.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ai_race.cpp 13 Jan 2004 01:15:22 -0000 1.2 --- ai_race.cpp 29 Jan 2004 21:20:28 -0000 1.3 *************** *** 3,7 **** #include <string.h> ! #include "melee.h" REGISTER_FILE --- 3,7 ---- #include <string.h> ! #include "../melee.h" REGISTER_FILE Index: gamedata.cpp =================================================================== RCS file: /cvsroot/timewarp/source/gamex/gamedata.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** gamedata.cpp 25 Jan 2004 12:40:19 -0000 1.10 --- gamedata.cpp 29 Jan 2004 21:20:28 -0000 1.11 *************** *** 3,11 **** #include <string.h> ! #include "melee.h" REGISTER_FILE ! #include "frame.h" ! #include "melee/mview.h" --- 3,11 ---- #include <string.h> ! #include "../melee.h" REGISTER_FILE ! #include "../frame.h" ! #include "../melee/mview.h" Index: gamedata.h =================================================================== RCS file: /cvsroot/timewarp/source/gamex/gamedata.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** gamedata.h 25 Jan 2004 12:40:21 -0000 1.11 --- gamedata.h 29 Jan 2004 21:20:28 -0000 1.12 *************** *** 2,6 **** #define __GAMEX_DATA__ ! #include "melee/mframe.h" #include <stdio.h> --- 2,6 ---- #define __GAMEX_DATA__ ! #include "../melee/mframe.h" #include <stdio.h> Index: gamedata_map.cpp =================================================================== RCS file: /cvsroot/timewarp/source/gamex/gamedata_map.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** gamedata_map.cpp 25 Jan 2004 12:40:21 -0000 1.3 --- gamedata_map.cpp 29 Jan 2004 21:20:28 -0000 1.4 *************** *** 4,12 **** #include <string.h> ! #include "melee.h" REGISTER_FILE ! #include "frame.h" ! #include "melee/mview.h" --- 4,12 ---- #include <string.h> ! #include "../melee.h" REGISTER_FILE ! #include "../frame.h" ! #include "../melee/mview.h" Index: gamedata_map.h =================================================================== RCS file: /cvsroot/timewarp/source/gamex/gamedata_map.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** gamedata_map.h 13 Jan 2004 01:15:22 -0000 1.2 --- gamedata_map.h 29 Jan 2004 21:20:28 -0000 1.3 *************** *** 2,6 **** #define __GAMEX_DATA_MAP__ ! #include "melee/mframe.h" #include <stdio.h> --- 2,6 ---- #define __GAMEX_DATA_MAP__ ! #include "../melee/mframe.h" #include <stdio.h> Index: gamedialogue.cpp =================================================================== RCS file: /cvsroot/timewarp/source/gamex/gamedialogue.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** gamedialogue.cpp 13 Jan 2004 01:15:22 -0000 1.6 --- gamedialogue.cpp 29 Jan 2004 21:20:28 -0000 1.7 *************** *** 5,9 **** #include <string.h> ! #include "melee.h" REGISTER_FILE --- 5,9 ---- #include <string.h> ! #include "../melee.h" REGISTER_FILE Index: gamedialogue.h =================================================================== RCS file: /cvsroot/timewarp/source/gamex/gamedialogue.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** gamedialogue.h 13 Jan 2004 01:15:22 -0000 1.6 --- gamedialogue.h 29 Jan 2004 21:20:28 -0000 1.7 *************** *** 9,13 **** #include "edit/disk_stuff.h" ! #include "twgui/twgui.h" --- 9,13 ---- #include "edit/disk_stuff.h" ! #include "../twgui/twgui.h" Index: gamegeneral.cpp =================================================================== RCS file: /cvsroot/timewarp/source/gamex/gamegeneral.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** gamegeneral.cpp 13 Jan 2004 01:15:22 -0000 1.10 --- gamegeneral.cpp 29 Jan 2004 21:20:28 -0000 1.11 *************** *** 3,11 **** #include <string.h> ! #include "melee.h" REGISTER_FILE ! #include "melee/mview.h" ! #include "frame.h" #include "gamegeneral.h" --- 3,11 ---- #include <string.h> ! #include "../melee.h" REGISTER_FILE ! #include "../melee/mview.h" ! #include "../frame.h" #include "gamegeneral.h" Index: gamegeneral.h =================================================================== RCS file: /cvsroot/timewarp/source/gamex/gamegeneral.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** gamegeneral.h 13 Jan 2004 01:15:22 -0000 1.7 --- gamegeneral.h 29 Jan 2004 21:20:28 -0000 1.8 *************** *** 2,6 **** #define __GAMEX_GENERAL__ ! #include "melee.h" Vector2 uncorner ( Vector2 pos ); --- 2,6 ---- #define __GAMEX_GENERAL__ ! #include "../melee.h" Vector2 uncorner ( Vector2 pos ); Index: gamehyper.cpp =================================================================== RCS file: /cvsroot/timewarp/source/gamex/gamehyper.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** gamehyper.cpp 25 Jan 2004 12:40:21 -0000 1.8 --- gamehyper.cpp 29 Jan 2004 21:20:28 -0000 1.9 *************** *** 3,18 **** #include <string.h> ! #include "melee.h" REGISTER_FILE ! #include "melee/mlog.h" ! #include "melee/mcontrol.h" ! #include "melee/mframe.h" ! #include "melee/mview.h" ! #include "melee/mitems.h" ! #include "melee/manim.h" ! #include "scp.h" ! #include "util/history.h" --- 3,18 ---- #include <string.h> ! #include "../melee.h" REGISTER_FILE ! #include "../melee/mlog.h" ! #include "../melee/mcontrol.h" ! #include "../melee/mframe.h" ! #include "../melee/mview.h" ! #include "../melee/mitems.h" ! #include "../melee/manim.h" ! #include "../scp.h" ! #include "../util/history.h" Index: gamemelee.cpp =================================================================== RCS file: /cvsroot/timewarp/source/gamex/gamemelee.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** gamemelee.cpp 13 Jan 2004 01:15:22 -0000 1.8 --- gamemelee.cpp 29 Jan 2004 21:20:28 -0000 1.9 *************** *** 12,23 **** REGISTER_FILE ! #include "melee/mlog.h" ! #include "melee/mcontrol.h" ! #include "melee/mframe.h" ! #include "melee/mview.h" ! #include "melee/mitems.h" ! #include "scp.h" ! #include "util/history.h" --- 12,23 ---- REGISTER_FILE ! #include "../melee/mlog.h" ! #include "../melee/mcontrol.h" ! #include "../melee/mframe.h" ! #include "../melee/mview.h" ! #include "../melee/mitems.h" ! #include "../scp.h" ! #include "../util/history.h" *************** *** 29,40 **** #include <string> ! #include "sc2ships.h" ! ! #include "melee/mcbodies.h" - #include "melee.h" - #include "melee/mframe.h" #include "ai_fleet.h" --- 29,37 ---- #include <string> ! #include "../sc2ships.h" + #include "../melee/mcbodies.h" #include "ai_fleet.h" Index: gamemelee.h =================================================================== RCS file: /cvsroot/timewarp/source/gamex/gamemelee.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** gamemelee.h 13 Jan 2004 01:15:22 -0000 1.6 --- gamemelee.h 29 Jan 2004 21:20:28 -0000 1.7 *************** *** 7,11 **** #include "gamegeneral.h" ! #include "melee/mgame.h" --- 7,11 ---- #include "gamegeneral.h" ! #include "../melee/mgame.h" Index: gameplanetscan.cpp =================================================================== RCS file: /cvsroot/timewarp/source/gamex/gameplanetscan.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** gameplanetscan.cpp 25 Jan 2004 12:40:21 -0000 1.7 --- gameplanetscan.cpp 29 Jan 2004 21:20:28 -0000 1.8 *************** *** 3,17 **** #include <string.h> ! #include "melee.h" REGISTER_FILE ! #include "melee/mlog.h" ! #include "melee/mcontrol.h" ! #include "melee/mframe.h" ! #include "melee/mview.h" ! #include "melee/mitems.h" ! #include "scp.h" ! #include "util/history.h" --- 3,17 ---- #include <string.h> ! #include "../melee.h" REGISTER_FILE ! #include "../melee/mlog.h" ! #include "../melee/mcontrol.h" ! #include "../melee/mframe.h" ! #include "../melee/mview.h" ! #include "../melee/mitems.h" ! #include "../scp.h" ! #include "../util/history.h" *************** *** 22,28 **** #include "stuff/space_body.h" ! #include "melee/mshot.h" ! #include "twgui/gamebuttonevent.h" --- 22,28 ---- #include "stuff/space_body.h" ! #include "../melee/mshot.h" ! #include "../twgui/gamebuttonevent.h" Index: gameplanetscan.h =================================================================== RCS file: /cvsroot/timewarp/source/gamex/gameplanetscan.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** gameplanetscan.h 25 Jan 2004 12:40:21 -0000 1.6 --- gameplanetscan.h 29 Jan 2004 21:20:28 -0000 1.7 *************** *** 8,12 **** ! #include "other/planet3d.h" --- 8,12 ---- ! #include "../other/planet3d.h" Index: gameplanetview.cpp =================================================================== RCS file: /cvsroot/timewarp/source/gamex/gameplanetview.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** gameplanetview.cpp 13 Jan 2004 01:15:22 -0000 1.12 --- gameplanetview.cpp 29 Jan 2004 21:20:28 -0000 1.13 *************** *** 3,17 **** #include <string.h> ! #include "melee.h" REGISTER_FILE ! #include "melee/mlog.h" ! #include "melee/mcontrol.h" ! #include "melee/mframe.h" ! #include "melee/mview.h" ! #include "melee/mitems.h" ! #include "scp.h" ! #include "util/history.h" --- 3,17 ---- #include <string.h> ! #include "../melee.h" REGISTER_FILE ! #include "../melee/mlog.h" ! #include "../melee/mcontrol.h" ! #include "../melee/mframe.h" ! #include "../melee/mview.h" ! #include "../melee/mitems.h" ! #include "../scp.h" ! #include "../util/history.h" *************** *** 27,32 **** #include "stuff/backgr_stars.h" ! #include "twgui/twgui.h" ! #include "twgui/twpopup.h" #include "general/sprites.h" --- 27,32 ---- #include "stuff/backgr_stars.h" ! #include "../twgui/twgui.h" ! #include "../twgui/twpopup.h" #include "general/sprites.h" Index: gameplanetview.h =================================================================== RCS file: /cvsroot/timewarp/source/gamex/gameplanetview.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** gameplanetview.h 13 Jan 2004 01:15:22 -0000 1.9 --- gameplanetview.h 29 Jan 2004 21:20:28 -0000 1.10 *************** *** 7,12 **** #include "gamegeneral.h" ! #include "twgui/twwindow.h" ! #include "twgui/twbuttontypes.h" --- 7,12 ---- #include "gamegeneral.h" ! #include "../twgui/twwindow.h" ! #include "../twgui/twbuttontypes.h" Index: gameproject.cpp =================================================================== RCS file: /cvsroot/timewarp/source/gamex/gameproject.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** gameproject.cpp 13 Jan 2004 01:15:22 -0000 1.10 --- gameproject.cpp 29 Jan 2004 21:20:28 -0000 1.11 *************** *** 3,7 **** #include <string.h> ! #include "melee.h" REGISTER_FILE --- 3,7 ---- #include <string.h> ! #include "../melee.h" REGISTER_FILE Index: gameproject.h =================================================================== RCS file: /cvsroot/timewarp/source/gamex/gameproject.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** gameproject.h 13 Jan 2004 01:15:22 -0000 1.10 --- gameproject.h 29 Jan 2004 21:20:28 -0000 1.11 *************** *** 2,16 **** #define __GAME_PROJECT__ ! #include "melee/mframe.h" ! #include "melee/mview.h" ! #include "frame.h" ! #include "util/history.h" ! #include "twgui/twwindow.h" ! #include "twgui/twbuttontypes.h" #include "gamegeneral.h" ! #include "melee/mtarget.h" extern BITMAP *game_screen; --- 2,16 ---- #define __GAME_PROJECT__ ! #include "../melee/mframe.h" ! #include "../melee/mview.h" ! #include "../frame.h" ! #include "../util/history.h" ! #include "../twgui/twwindow.h" ! #include "../twgui/twbuttontypes.h" #include "gamegeneral.h" ! #include "../melee/mtarget.h" extern BITMAP *game_screen; Index: gamesolarview.cpp =================================================================== RCS file: /cvsroot/timewarp/source/gamex/gamesolarview.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** gamesolarview.cpp 13 Jan 2004 01:15:23 -0000 1.9 --- gamesolarview.cpp 29 Jan 2004 21:20:28 -0000 1.10 *************** *** 5,9 **** //#include <string.h> ! #include "melee.h" REGISTER_FILE --- 5,9 ---- //#include <string.h> ! #include "../melee.h" REGISTER_FILE *************** *** 19,24 **** #include "stuff/backgr_stars.h" ! #include "twgui/twgui.h" ! #include "twgui/twmenuexamples.h" #include "general/sprites.h" --- 19,24 ---- #include "stuff/backgr_stars.h" ! #include "../twgui/twgui.h" ! #include "../twgui/twmenuexamples.h" #include "general/sprites.h" Index: gamesolarview.h =================================================================== RCS file: /cvsroot/timewarp/source/gamex/gamesolarview.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** gamesolarview.h 13 Jan 2004 01:15:23 -0000 1.8 --- gamesolarview.h 29 Jan 2004 21:20:28 -0000 1.9 *************** *** 7,13 **** #include "gamegeneral.h" ! #include "twgui/twbuttontypes.h" ! #include "twgui/twpopup.h" ! #include "twgui/twmenuexamples.h" #include "stuff/space_body.h" --- 7,13 ---- #include "gamegeneral.h" ! #include "../twgui/twbuttontypes.h" ! #include "../twgui/twpopup.h" ! #include "../twgui/twmenuexamples.h" #include "stuff/space_body.h" Index: gamestarmap.cpp =================================================================== RCS file: /cvsroot/timewarp/source/gamex/gamestarmap.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** gamestarmap.cpp 13 Jan 2004 01:15:23 -0000 1.10 --- gamestarmap.cpp 29 Jan 2004 21:20:28 -0000 1.11 *************** *** 3,17 **** #include <string.h> ! #include "melee.h" REGISTER_FILE ! #include "melee/mlog.h" ! #include "melee/mcontrol.h" ! #include "melee/mframe.h" ! #include "melee/mview.h" ! #include "melee/mitems.h" ! #include "scp.h" ! #include "util/history.h" #include "gamedata.h" --- 3,17 ---- #include <string.h> ! #include "../melee.h" REGISTER_FILE ! #include "../melee/mlog.h" ! #include "../melee/mcontrol.h" ! #include "../melee/mframe.h" ! #include "../melee/mview.h" ! #include "../melee/mitems.h" ! #include "../scp.h" ! #include "../util/history.h" #include "gamedata.h" Index: gamestarmap.h =================================================================== RCS file: /cvsroot/timewarp/source/gamex/gamestarmap.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** gamestarmap.h 13 Jan 2004 01:15:23 -0000 1.9 --- gamestarmap.h 29 Jan 2004 21:20:28 -0000 1.10 *************** *** 10,15 **** #include "gamesolarview.h" ! #include "twgui/twbuttontypes.h" ! #include "twgui/twpopup.h" #include "stuff/space_body.h" --- 10,15 ---- #include "gamesolarview.h" ! #include "../twgui/twbuttontypes.h" ! #include "../twgui/twpopup.h" #include "stuff/space_body.h" Index: projectx.cpp =================================================================== RCS file: /cvsroot/timewarp/source/gamex/projectx.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** projectx.cpp 25 Jan 2004 12:40:21 -0000 1.13 --- projectx.cpp 29 Jan 2004 21:20:28 -0000 1.14 *************** *** 3,7 **** #include <string.h> ! #include "melee.h" REGISTER_FILE --- 3,7 ---- #include <string.h> ! #include "../melee.h" REGISTER_FILE |
5 messages has been excluded from this view by a project administrator.
