- Timestamp:
- Apr 29, 2013, 5:26:54 PM (12 years ago)
- Location:
- Daodan/src
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
Daodan/src/Daodan.c
r739 r837 87 87 bool DDrPatch_Init() 88 88 { 89 DDrStartupMessage(" patching engine");89 DDrStartupMessage("Daodan: Patching engine"); 90 90 91 91 // Font texture cache doubled … … 263 263 if(patch_chinese) 264 264 { 265 HMODULE dll; 266 DWORD err; 267 268 DDrStartupMessage("Loading chinese DLL"); 269 dll = LoadLibrary("xfhsm_oni.dll"); 270 err = GetLastError(); 271 if( dll ) 265 if (GetFileAttributes("xfhsm_oni.dll") != INVALID_FILE_ATTRIBUTES) 272 266 { 273 void* proc = GetProcAddress( dll, "InstallHook" ); 274 if(proc) 267 HMODULE dll; 268 DWORD err; 269 270 DDrStartupMessage("Daodan: Loading chinese DLL"); 271 dll = LoadLibrary("xfhsm_oni.dll"); 272 err = GetLastError(); 273 if( dll ) 275 274 { 276 ((CHINESEPROC)proc)(GetCurrentThreadId()); 275 void* proc = GetProcAddress( dll, "InstallHook" ); 276 if(proc) 277 { 278 ((CHINESEPROC)proc)(GetCurrentThreadId()); 279 } 280 } else { 281 char msg[100]; 282 FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, err, 0, msg, 100, NULL); 283 DDrStartupMessage("Daodan: Loading DLL failed with error %i: %s", err, msg); 277 284 } 278 } else {279 char msg[100];280 FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, err, 0, msg, 100, NULL);281 DDrStartupMessage(" - Module loading failed with error %i: %s", err, msg);282 285 } 283 286 } … … 364 367 { 365 368 ini_section = s_unknown; 366 DDrStartupMessage(" unrecognisedsection \"%s\"", section);369 DDrStartupMessage("Daodan: Unrecognised ini section \"%s\"", section); 367 370 } 368 371 } … … 394 397 opt_gamma = !_stricmp(inifile_cleanstr(value), "true"); 395 398 else 396 DDrStartupMessage(" unrecognisedoption \"%s\"", name);399 DDrStartupMessage("Daodan: Unrecognised ini option \"%s\"", name); 397 400 break; 398 401 case s_patch: … … 458 461 patch_binkplay = !_stricmp(inifile_cleanstr(value), "true"); 459 462 else 460 DDrStartupMessage(" unrecognisedpatch \"%s\"", name);463 DDrStartupMessage("Daodan: Unrecognised ini patch \"%s\"", name); 461 464 break; 462 465 case s_language: … … 568 571 DDr_CheatTable[21].message_off = _strdup(value); 569 572 else 570 DDrStartupMessage(" unrecognisedlanguage item \"%s\"", name);573 DDrStartupMessage("Daodan: Unrecognised ini language item \"%s\"", name); 571 574 break; 572 575 case s_bsl: … … 584 587 { 585 588 FILE* fp; 586 DDrStartupMessage(" daodan.ini doesn't exist, creating");589 DDrStartupMessage("Daodan: daodan.ini doesn't exist, creating"); 587 590 fp = fopen("daodan.ini", "w"); 588 591 if (fp) … … 593 596 } 594 597 595 DDrStartupMessage(" parsing daodan.ini...");598 DDrStartupMessage("Daodan: Parsing daodan.ini..."); 596 599 if (!inifile_read("daodan.ini", DDrIniCallback)) 597 DDrStartupMessage(" error reading daodan.ini, check your syntax!");598 DDrStartupMessage(" finished parsing");600 DDrStartupMessage("Daodan: Error reading daodan.ini, check your syntax!"); 601 DDrStartupMessage("Daodan: Finished parsing"); 599 602 } 600 603 … … 651 654 bool falseoption; 652 655 653 DDrStartupMessage(" daodan attached!");656 DDrStartupMessage("Daodan: Daodan attached!"); 654 657 655 658 // Tell Oni to not load non levelX_final-files by default: … … 660 663 661 664 DDrConfig(); 662 DDrStartupMessage(" parsing command line...");665 DDrStartupMessage("Daodan: Parsing command line..."); 663 666 for (i = 1; i < argc; i ++) 664 667 { … … 688 691 else 689 692 { 690 DDrStartupMessage(" parse error \"%s\"", argv[i]);693 DDrStartupMessage("Daodan: Parse error \"%s\"", argv[i]); 691 694 break; 692 695 } 693 696 } 694 DDrStartupMessage(" finished parsing");697 DDrStartupMessage("Daodan: Finished parsing"); 695 698 DDrPatch_Init(); 696 699 -
Daodan/src/Daodan_BSL.c
r739 r837 797 797 798 798 if (!*type) 799 DDrStartupMessage(" badly formed bsl definition for \"%s\"", name);799 DDrStartupMessage("Daodan: Badly formed bsl definition for \"%s\"", name); 800 800 801 801 if (!strcmp(type, "int")) … … 809 809 else 810 810 { 811 DDrStartupMessage(" unknown type in bsl definition for \"%s\"", name);811 DDrStartupMessage("Daodan: Unknown type in bsl definition for \"%s\"", name); 812 812 return true; 813 813 } … … 854 854 void SLrConfig() 855 855 { 856 DDrStartupMessage(" re-parsing daodan.ini for bsl...");856 DDrStartupMessage("Daodan: Re-parsing daodan.ini for bsl..."); 857 857 inifile_read("daodan.ini", SLrIniCallback); 858 DDrStartupMessage(" finished parsing");858 DDrStartupMessage("Daodan: Finished parsing"); 859 859 } 860 860 … … 867 867 if(errornum) 868 868 { 869 DDrStartupMessage(" Registration of script command %s failed with error %i", name, errornum);869 DDrStartupMessage("Daodan: Registration of script command %s failed with error %i", name, errornum); 870 870 } 871 871 } else { 872 DDrStartupMessage(" Registration of script command %s failed because of a too long argfmt", name);872 DDrStartupMessage("Daodan: Registration of script command %s failed because of a too long argfmt", name); 873 873 } 874 874 } -
Daodan/src/Daodan_Cheater.c
r692 r837 42 42 { "bigbadboss", "Boss Shield Enabled", "Boss Shield Disabled", cheat_bigbadboss }, 43 43 { "bulletproof", "Force Field Enabled", "Force Field Disabled", cheat_bulletproof }, 44 { "kangaroo", "Alex Okita Mode Enabled", "Alex Okita Mode Disabled", cheat_kangaroo }, 45 { "himynameisalex", "Kangaroo Jump Enabled", "Kangaroo Jump Disabled", cheat_kangaroo }, 44 { "kangaroo", "Kangaroo Jump Enabled", "Kangaroo Jump Disabled", cheat_kangaroo }, 46 45 { "marypoppins", "Jet Pack Mode Enabled", "Jet Pack Mode Disabled", cheat_marypoppins }, 47 46 { "buddha", "Unkillable Enabled", "Unkillable Disabled", cheat_buddha }, -
Daodan/src/Daodan_GL.c
r739 r837 67 67 signed int j; 68 68 69 DDrStartupMessage(" listing display modes");69 DDrStartupMessage("Daodan: Listing display modes"); 70 70 71 71 memset(modes, 0, sizeof(M3tDisplayMode) * DD_MAX_MODES); … … 168 168 } 169 169 170 DDrStartupMessage(" %u modes available:", vmodes);170 DDrStartupMessage("Daodan: %u modes available:", vmodes); 171 171 for (i = 0; i < vmodes; ++i) 172 DDrStartupMessage(" %ux%ux%u", modes[i].Width, modes[i].Height, modes[i].Depth);172 DDrStartupMessage("Daodan: %ux%ux%u", modes[i].Width, modes[i].Height, modes[i].Depth); 173 173 174 174 return vmodes; … … 330 330 if (gl_api->wglSetDeviceGammaRamp3DFX) 331 331 { 332 UUrStartupMessage(" Using 3dfx gamma adjustment");332 UUrStartupMessage("Daodan: Using 3dfx gamma adjustment"); 333 333 GLgGammaRampValid = gl_api->wglGetDeviceGammaRamp3DFX(gl->hDC, GLgInitialGammaRamp); 334 334 } 335 335 else 336 336 { 337 UUrStartupMessage(" Using Windows gamma adjustment");337 UUrStartupMessage("Daodan: Using Windows gamma adjustment"); 338 338 GLgGammaRampValid = GetDeviceGammaRamp(gl->hDC, GLgInitialGammaRamp); 339 339 } … … 399 399 if (!M3gResolutionSwitch && opt_gamma) 400 400 { 401 UUrStartupMessage(" Ignoring gamma setting due to windowed mode");401 UUrStartupMessage("Daodan: Ignoring gamma setting due to windowed mode"); 402 402 opt_gamma = false; 403 403 } … … 422 422 423 423 exit_err: 424 AUrMessageBox(1, " Failed to initialize OpenGL contexts; Oni will now exit.");424 AUrMessageBox(1, "Daodan: Failed to initialize OpenGL contexts; Oni will now exit."); 425 425 exit(0); 426 426 return 0; -
Daodan/src/Daodan_Win32.c
r705 r837 125 125 if (FindWindow("ONI ", "ONI ")) 126 126 { 127 AUrMessageBox(1, " There is already an instance of the game running.");127 AUrMessageBox(1, "Daodan: There is already an instance of the game running."); 128 128 exit(0); 129 129 } -
Daodan/src/_Version.h
r693 r837 6 6 7 7 #define DAODAN_VERSION_MAJOR 3 8 #define DAODAN_VERSION_MINOR 28 #define DAODAN_VERSION_MINOR 3 9 9 #define DAODAN_VERSION_STRING STRINGIZE(DAODAN_VERSION_MAJOR) "." STRINGIZE(DAODAN_VERSION_MINOR) 10 10
Note:
See TracChangeset
for help on using the changeset viewer.