Menu
▾
▴
[Clicksaver-cvs] ClickSaverSrc clicksaver.c,1.13,1.14 clicksaver.h,1.12,1.13 guidef.c,1.17,1.18 hook.c,1.2,1.3
|
From: Corey F. <gn...@us...> - 2004-08-28 18:04:22
|
Update of /cvsroot/clicksaver/ClickSaverSrc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16704 Modified Files: clicksaver.c clicksaver.h guidef.c hook.c Log Message: Moved some GUI Options arounds, added Skip Rebuild option Index: clicksaver.c =================================================================== RCS file: /cvsroot/clicksaver/ClickSaverSrc/clicksaver.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** clicksaver.c 25 Jan 2004 19:35:52 -0000 1.13 --- clicksaver.c 28 Aug 2004 18:04:08 -0000 1.14 *************** *** 1,4 **** --- 1,7 ---- /* * $Log$ + * Revision 1.14 2004/08/28 18:04:08 gnarf37 + * Moved some GUI Options arounds, added Skip Rebuild option + * * Revision 1.13 2004/01/25 19:35:52 gnarf37 * 2.3.0 beta 3 - Shrunk Database a bit, added Item Value options, make options menu smaller a tad so that 800x600 might be able to use it again... *************** *** 198,202 **** if( bUpdateDB ) { - FILETIME OrigTime; puSetAttribute( puGetObjectFromCollection( g_pCol, CS_DBCOPYMSGBOX ), PUA_WINDOW_OPENED, TRUE ); --- 201,204 ---- *************** *** 211,241 **** puSetAttribute( puGetObjectFromCollection( g_pCol, CS_DBCOPYMSGBOX ), PUA_WINDOW_OPENED, FALSE ); ! puSetAttribute( puGetObjectFromCollection( g_pCol, CS_CREATINGDBMSGBOX ), PUA_WINDOW_OPENED, TRUE ); ! puCheckMessages(); ! ! if( !CreateLocalDatabase() ) { - puSetAttribute( puGetObjectFromCollection( g_pCol, CS_CREATINGDBMSGBOX ), PUA_WINDOW_OPENED, FALSE ); - // Delete the database in case it was partly created, - // so we're not using a partial database on next - // execution. - DeleteFile( "AODatabase.bdb" ); - g_pDB = NULL; // It has been already closed by createlocaldatabase ! DisplayErrorMessage( "Failed to create local database.", FALSE ); ! CleanUp(); ! return -1; ! } ! puSetAttribute( puGetObjectFromCollection( g_pCol, CS_CREATINGDBMSGBOX ), PUA_WINDOW_OPENED, FALSE ); ! sprintf( DBPath, "%s\\cd_image\\data\\db\\ResourceDatabase.dat", g_AODir ); ! hOrigDB = CreateFile( DBPath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL ); ! hLocalDB = CreateFile( "AODatabase.bdb", GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL ); ! GetFileTime( hOrigDB, NULL, NULL, &OrigTime ); ! SetFileTime( hLocalDB, NULL, NULL, &OrigTime ); ! CloseHandle( hOrigDB ); ! CloseHandle( hLocalDB ); } --- 213,240 ---- puSetAttribute( puGetObjectFromCollection( g_pCol, CS_DBCOPYMSGBOX ), PUA_WINDOW_OPENED, FALSE ); ! if (pAppMsg->Message == CSAM_OK ) { ! puSetAttribute( puGetObjectFromCollection( g_pCol, CS_CREATINGDBMSGBOX ), PUA_WINDOW_OPENED, TRUE ); ! puCheckMessages(); ! if( !CreateLocalDatabase() ) ! { ! puSetAttribute( puGetObjectFromCollection( g_pCol, CS_CREATINGDBMSGBOX ), PUA_WINDOW_OPENED, FALSE ); ! // Delete the database in case it was partly created, ! // so we're not using a partial database on next ! // execution. ! DeleteFile( "AODatabase.bdb" ); ! g_pDB = NULL; // It has been already closed by createlocaldatabase ! ! DisplayErrorMessage( "Failed to create local database.", FALSE ); ! CleanUp(); ! return -1; ! } ! ! puSetAttribute( puGetObjectFromCollection( g_pCol, CS_CREATINGDBMSGBOX ), PUA_WINDOW_OPENED, FALSE ); ! } } Index: clicksaver.h =================================================================== RCS file: /cvsroot/clicksaver/ClickSaverSrc/clicksaver.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** clicksaver.h 25 Jan 2004 19:35:53 -0000 1.12 --- clicksaver.h 28 Aug 2004 18:04:08 -0000 1.13 *************** *** 1,4 **** --- 1,7 ---- /* * $Log$ + * Revision 1.13 2004/08/28 18:04:08 gnarf37 + * Moved some GUI Options arounds, added Skip Rebuild option + * * Revision 1.12 2004/01/25 19:35:53 gnarf37 * 2.3.0 beta 3 - Shrunk Database a bit, added Item Value options, make options menu smaller a tad so that 800x600 might be able to use it again... *************** *** 121,124 **** --- 124,128 ---- { CSAM_QUIT = 1, + CSAM_SKIP, CSAM_OK, CSAM_CANCEL, Index: hook.c =================================================================== RCS file: /cvsroot/clicksaver/ClickSaverSrc/hook.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** hook.c 27 May 2003 00:14:42 -0000 1.2 --- hook.c 28 Aug 2004 18:04:08 -0000 1.3 *************** *** 26,33 **** // Inject the dlls in clientr process sprintf( Temp, "%s\\madCodeHookLib.dll", g_CSDir ); ! InjectLibrary( AOProcessHnd, Temp ); sprintf( Temp, "%s\\AOHook.dll", g_CSDir ); ! InjectLibrary( AOProcessHnd, Temp ); CloseHandle( AOProcessHnd ); --- 26,33 ---- // Inject the dlls in clientr process sprintf( Temp, "%s\\madCodeHookLib.dll", g_CSDir ); ! InjectLibrary( AOProcessHnd, Temp); sprintf( Temp, "%s\\AOHook.dll", g_CSDir ); ! InjectLibrary( AOProcessHnd, Temp); CloseHandle( AOProcessHnd ); Index: guidef.c =================================================================== RCS file: /cvsroot/clicksaver/ClickSaverSrc/guidef.c,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** guidef.c 22 Feb 2004 05:41:13 -0000 1.17 --- guidef.c 28 Aug 2004 18:04:08 -0000 1.18 *************** *** 1,4 **** --- 1,7 ---- /* * $Log$ + * Revision 1.18 2004/08/28 18:04:08 gnarf37 + * Moved some GUI Options arounds, added Skip Rebuild option + * * Revision 1.17 2004/02/22 05:41:13 gnarf37 * Added Set Sliders button to the main window *************** *** 144,148 **** 0, PU_ENDGROUP, ! PU_ENDGROUP, // **** --- 147,155 ---- 0, PU_ENDGROUP, ! PUM_ADDCHILD, PU_TITLE( "Seach Options" ), ! PUM_ADDCHILD, PU_HORGROUP, ! PUM_ADDCHILD, PU_CHECKBOX( CS_ALERTITEM_CB, "Match in Buying Agent / " ), ! PUM_ADDCHILD, PU_SET_CHECKBOX( CS_HIGHLIGHTITEM_CB, "Highlight Matches" ), ! PU_ENDGROUP, PU_ENDGROUP, // **** *************** *** 175,178 **** --- 182,190 ---- 0, PU_ENDGROUP, + PUM_ADDCHILD, PU_TITLE( "Seach Options" ), + PUM_ADDCHILD, PU_HORGROUP, + PUM_ADDCHILD, PU_CHECKBOX( CS_ALERTLOC_CB, "Match in Buying Agent / " ), + PUM_ADDCHILD, PU_SET_CHECKBOX( CS_HIGHLIGHTLOC_CB, "Highlight Matches" ), + PU_ENDGROUP, PU_ENDGROUP, *************** *** 192,195 **** --- 204,212 ---- PUM_ADDCHILD, PU_SET_CHECKBOX( CS_TYPEASS_CB, "Kill Person" ), PU_ENDGROUP, + PUM_ADDCHILD, PU_TITLE( "Seach Options" ), + PUM_ADDCHILD, PU_HORGROUP, + PUM_ADDCHILD, PU_CHECKBOX( CS_ALERTTYPE_CB, "Match in Buying Agent / " ), + PUM_ADDCHILD, PU_SET_CHECKBOX( CS_HIGHLIGHTTYPE_CB, "Highlight Matches" ), + PU_ENDGROUP, PUM_ADDCHILD, PU_SPACER, *************** *** 485,492 **** PUM_ADDCHILD, PU_FRAMED_VERGROUP( PUFRAME_GROUP, "Options" ), ! PUM_ADDCHILD, PU_ACTION_OBJDEF, CS_OPTIONSFOLD3, ( PUU32 )"Fold", PUA_FOLD_LABEL, ( PUU32 )"General", PUA_FOLD_FOLDED, 0, ! PUA_FOLD_CONTENTS, PU_HORGROUP, PUM_ADDCHILD, PU_LEFT_VERGROUP, --- 502,510 ---- PUM_ADDCHILD, PU_FRAMED_VERGROUP( PUFRAME_GROUP, "Options" ), ! /* PUM_ADDCHILD, PU_ACTION_OBJDEF, CS_OPTIONSFOLD3, ( PUU32 )"Fold", PUA_FOLD_LABEL, ( PUU32 )"General", PUA_FOLD_FOLDED, 0, ! PUA_FOLD_CONTENTS, */ ! PUM_ADDCHILD, PU_HORGROUP, PUM_ADDCHILD, PU_LEFT_VERGROUP, *************** *** 510,545 **** PUM_ADDCHILD, PU_SPACER, PU_ENDGROUP, ! 0, 0, /// End Fold ! ! ! PUM_ADDCHILD, PU_ACTION_OBJDEF, CS_OPTIONSFOLD3, ( PUU32 )"Fold", ! PUA_FOLD_LABEL, ( PUU32 )"Mission search conditions", ! PUA_FOLD_FOLDED, 1, ! PUA_FOLD_CONTENTS, ! PU_HORGROUP, ! PUM_ADDCHILD, PU_LEFT_VERGROUP, ! PUM_ADDCHILD, PU_CHECKBOX( CS_ALERTITEM_CB, "Listed item is found" ), ! PUM_ADDCHILD, PU_CHECKBOX( CS_ALERTLOC_CB, "Listed location is found" ), ! PUM_ADDCHILD, PU_CHECKBOX( CS_ALERTTYPE_CB, "With Listed Mission Type" ), ! PUM_ADDCHILD, PU_LABEL( "Check multiples to search for missions" ), ! PUM_ADDCHILD, PU_LABEL( "that satisfy all conditions" ), ! PU_ENDGROUP, ! PUM_ADDCHILD, PU_SPACER, ! PU_ENDGROUP, ! 0, 0, /// End Fold - PUM_ADDCHILD, PU_ACTION_OBJDEF, CS_OPTIONSFOLD3, ( PUU32 )"Fold", - PUA_FOLD_LABEL, ( PUU32 )"Highlight On Match", - PUA_FOLD_FOLDED, 1, - PUA_FOLD_CONTENTS, - PU_HORGROUP, - PUM_ADDCHILD, PU_LEFT_VERGROUP, - PUM_ADDCHILD, PU_SET_CHECKBOX( CS_HIGHLIGHTITEM_CB, "Item" ), - PUM_ADDCHILD, PU_SET_CHECKBOX( CS_HIGHLIGHTLOC_CB, "Location" ), - PUM_ADDCHILD, PU_SET_CHECKBOX( CS_HIGHLIGHTTYPE_CB, "Type" ), - PU_ENDGROUP, - PUM_ADDCHILD, PU_SPACER, - PU_ENDGROUP, - 0, 0, /// End Fold PU_ENDGROUP, --- 528,533 ---- PUM_ADDCHILD, PU_SPACER, PU_ENDGROUP, ! // 0, 0, /// End Fold PU_ENDGROUP, *************** *** 838,841 **** --- 826,833 ---- PUM_ADDCHILD, PU_LABEL( " " ), PUM_ADDCHILD, PU_LABEL( "Make sure that AO isn't running, or it won't work." ), + PUM_ADDCHILD, PU_LABEL( " " ), + PUM_ADDCHILD, PU_LABEL( "You can Skip Building the new database, but be warned," ), + PUM_ADDCHILD, PU_LABEL( "it may cause some instability if there are any new items" ), + PUM_ADDCHILD, PU_LABEL( "in the mission terminals" ), PU_ENDGROUP, *************** *** 854,857 **** --- 846,857 ---- 0, + PUM_ADDCHILD, PU_ACTION_OBJDEF, 0, ( PUU32 )"Text", PUA_TEXT_STRING, ( PUU32 )"Skip", + PUA_CONTROL_FRAME, PUFRAME_BUTTON, + PUA_CONTROL_ISBUTTON, TRUE, 0, + PUM_ADDNOTIFICATION, + PUNOTIFY_CONDITION_ATTREQUALS, PUA_CONTROL_CLICKED, TRUE, + PUNOTIFY_ACTION_APPMSG, CSAM_SKIP, + 0, + PUM_ADDCHILD, PU_ACTION_OBJDEF, 0, ( PUU32 )"Text", PUA_TEXT_STRING, ( PUU32 )"Quit", PUA_CONTROL_FRAME, PUFRAME_BUTTON, |
