diff --git a/.vs/Speedy Eggbert 2 Source/v17/.suo b/.vs/Speedy Eggbert 2 Source/v17/.suo index 315d89b..055dbd2 100644 Binary files a/.vs/Speedy Eggbert 2 Source/v17/.suo and b/.vs/Speedy Eggbert 2 Source/v17/.suo differ diff --git a/.vs/Speedy Eggbert 2 Source/v17/Browse.VC.db b/.vs/Speedy Eggbert 2 Source/v17/Browse.VC.db index 744499d..989e273 100644 Binary files a/.vs/Speedy Eggbert 2 Source/v17/Browse.VC.db and b/.vs/Speedy Eggbert 2 Source/v17/Browse.VC.db differ diff --git a/Debug/Speedy Eggbert 2 Source.exe b/Debug/Speedy Eggbert 2 Source.exe index d413e02..653e723 100644 Binary files a/Debug/Speedy Eggbert 2 Source.exe and b/Debug/Speedy Eggbert 2 Source.exe differ diff --git a/Debug/Speedy Eggbert 2 Source.pdb b/Debug/Speedy Eggbert 2 Source.pdb index 921431a..ebecbb5 100644 Binary files a/Debug/Speedy Eggbert 2 Source.pdb and b/Debug/Speedy Eggbert 2 Source.pdb differ diff --git a/Speedy E.e424a3cb/Debug/Speedy E.e424a3cb.tlog/CL.command.1.tlog b/Speedy E.e424a3cb/Debug/Speedy E.e424a3cb.tlog/CL.command.1.tlog index fb71e5c..64b58e1 100644 Binary files a/Speedy E.e424a3cb/Debug/Speedy E.e424a3cb.tlog/CL.command.1.tlog and b/Speedy E.e424a3cb/Debug/Speedy E.e424a3cb.tlog/CL.command.1.tlog differ diff --git a/Speedy E.e424a3cb/Debug/Speedy E.e424a3cb.tlog/CL.read.1.tlog b/Speedy E.e424a3cb/Debug/Speedy E.e424a3cb.tlog/CL.read.1.tlog index 2867907..4f84df6 100644 Binary files a/Speedy E.e424a3cb/Debug/Speedy E.e424a3cb.tlog/CL.read.1.tlog and b/Speedy E.e424a3cb/Debug/Speedy E.e424a3cb.tlog/CL.read.1.tlog differ diff --git a/Speedy E.e424a3cb/Debug/Speedy E.e424a3cb.tlog/CL.write.1.tlog b/Speedy E.e424a3cb/Debug/Speedy E.e424a3cb.tlog/CL.write.1.tlog index 8c25cef..c8bbd43 100644 Binary files a/Speedy E.e424a3cb/Debug/Speedy E.e424a3cb.tlog/CL.write.1.tlog and b/Speedy E.e424a3cb/Debug/Speedy E.e424a3cb.tlog/CL.write.1.tlog differ diff --git a/Speedy E.e424a3cb/Debug/Speedy E.e424a3cb.tlog/link.read.1.tlog b/Speedy E.e424a3cb/Debug/Speedy E.e424a3cb.tlog/link.read.1.tlog index 86743c7..804b370 100644 Binary files a/Speedy E.e424a3cb/Debug/Speedy E.e424a3cb.tlog/link.read.1.tlog and b/Speedy E.e424a3cb/Debug/Speedy E.e424a3cb.tlog/link.read.1.tlog differ diff --git a/Speedy E.e424a3cb/Debug/Speedy Eggbert 2 Source.log b/Speedy E.e424a3cb/Debug/Speedy Eggbert 2 Source.log index 6d7c146..9394bcc 100644 --- a/Speedy E.e424a3cb/Debug/Speedy Eggbert 2 Source.log +++ b/Speedy E.e424a3cb/Debug/Speedy Eggbert 2 Source.log @@ -1,138 +1,4 @@ - blupi.cpp -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\def.h(241,9): warning C4005: 'MAXMOVEOBJECT': macro redefinition -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\def.h(480,9): warning C4005: 'WM_PHASE_PRIVATE': macro redefinition -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\resource.h(106,9): warning C4005: 'TX_SHOWNEXT': macro redefinition -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.h(29,9): warning C4005: 'MAXMOVEOBJECT': macro redefinition -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.h(90,1): warning C4091: 'typedef ': ignored on left of '' when no variable is declared -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\blupi.cpp(242,25): warning C4101: 'targetlevel': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\blupi.cpp(238,24): warning C4101: 'rcRect': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\blupi.cpp(238,18): warning C4101: 'clip': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\blupi.cpp(242,9): warning C4101: 'i': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\blupi.cpp(241,10): warning C4101: 'posMouse': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\blupi.cpp(354,28): warning C4293: '<<': shift count negative or too big, undefined behavior -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\blupi.cpp(363,28): warning C4293: '<<': shift count negative or too big, undefined behavior -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\blupi.cpp(345,8): warning C4101: 'posMouse': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\blupi.cpp(615,6): warning C4101: 'num2': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\blupi.cpp(619,8): warning C4101: 'open': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\blupi.cpp(663,11): warning C4101: 'rcRect': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\blupi.cpp(802,17): warning C4101: 'timeStep': unreferenced local variable - button.cpp -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\def.h(241,9): warning C4005: 'MAXMOVEOBJECT': macro redefinition -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\def.h(480,9): warning C4005: 'WM_PHASE_PRIVATE': macro redefinition -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.h(29,9): warning C4005: 'MAXMOVEOBJECT': macro redefinition -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\button.cpp(52,12): warning C4101: 'icon': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\button.cpp(52,9): warning C4101: 'i': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\button.cpp(177,8): warning C4101: 'rect': unreferenced local variable - ddutil.cpp - decor.cpp -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\def.h(241,9): warning C4005: 'MAXMOVEOBJECT': macro redefinition -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\def.h(480,9): warning C4005: 'WM_PHASE_PRIVATE': macro redefinition -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\resource.h(106,9): warning C4005: 'TX_SHOWNEXT': macro redefinition -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.h(29,9): warning C4005: 'MAXMOVEOBJECT': macro redefinition -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.h(90,1): warning C4091: 'typedef ': ignored on left of '' when no variable is declared -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(131,9): warning C4552: '!=': result of expression not used -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(143,9): warning C4101: 'i': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(554,16): warning C4554: '&': check operator precedence for possible error; use parentheses to clarify precedence -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(579,10): warning C4101: 'text': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(1008,15): warning C4101: 'tinyRect': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(1044,18): warning C4553: '==': result of expression not used; did you intend '='? -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(1277,39): warning C4553: '==': result of expression not used; did you intend '='? -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(1530,9): warning C4553: '==': result of expression not used; did you intend '='? -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(6532,8): warning C4101: 'type2': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(6565,94): warning C4244: '=': conversion from 'LONG' to 'short', possible loss of data -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(6588,6): warning C4101: 'players': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(6703,7): warning C4101: 'rect2': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(6702,10): warning C4101: 'rect1': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(6704,7): warning C4101: 'rect3': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(6785,13): warning C4101: 'moveObject': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(6800,8): warning C4101: 'tinyRect2': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(7866,9): warning C4101: 'tinyRect': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(8108,9): warning C4101: 'tinyRect': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(8163,7): warning C4101: 'tinyRect': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(8185,9): warning C4101: 'tinyRect': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(8221,9): warning C4101: 'src3': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(8251,9): warning C4101: 'tinyRect': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(8279,9): warning C4101: 'tinyRect': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(8307,9): warning C4101: 'tinyRect': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(8788,9): warning C4553: '==': result of expression not used; did you intend '='? -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(9021,16): warning C4129: '%': unrecognized character escape sequence -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(9025,15): warning C4129: 'w': unrecognized character escape sequence - event.cpp -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\def.h(241,9): warning C4005: 'MAXMOVEOBJECT': macro redefinition -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\def.h(480,9): warning C4005: 'WM_PHASE_PRIVATE': macro redefinition -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\resource.h(106,9): warning C4005: 'TX_SHOWNEXT': macro redefinition -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.h(29,9): warning C4005: 'MAXMOVEOBJECT': macro redefinition -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.h(90,1): warning C4091: 'typedef ': ignored on left of '' when no variable is declared -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(1289,9): warning C4552: '!=': result of expression not used -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(1316,13): warning C4101: 'pos': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(1453,13): warning C4101: 'i': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(1544,10): warning C4552: '!=': result of expression not used -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(1749,9): warning C4101: 'data': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(1836,8): warning C4101: 'element': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(1834,8): warning C4101: 'stream': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(1883,57): warning C4101: 'icon': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(1883,17): warning C4101: 'world': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(1881,17): warning C4101: 'levels': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(1883,42): warning C4101: 'volume': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(1883,24): warning C4101: 'time': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(1882,17): warning C4101: 'types': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(1880,17): warning C4101: 'i': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(1892,17): warning C4101: 'bEnable': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(1883,50): warning C4101: 'pente': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(1883,34): warning C4101: 'button': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2267,10): warning C4101: 'sound': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2269,7): warning C4101: 'bEnable': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2420,21): warning C4101: 'sound': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2599,7): warning C4101: 'bPrivate': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2600,7): warning C4101: 'bMission': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2598,7): warning C4101: 'bUser': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2623,7): warning C4101: 'bUser': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2661,15): warning C4101: 'world': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2661,28): warning C4101: 'total': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2666,8): warning C4101: 'pTerm': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2661,45): warning C4101: 'max': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2661,35): warning C4101: 'music': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2662,18): warning C4101: 'iconDim': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2662,8): warning C4101: 'totalDim': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2663,8): warning C4101: 'filename': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2661,22): warning C4101: 'time': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2661,8): warning C4101: 'index': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2664,8): warning C4101: 'pButtonExist': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2661,42): warning C4101: 'i': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2665,8): warning C4101: 'bEnable': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2665,17): warning C4101: 'bHide': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2797,23): warning C4101: 'icon': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2797,14): warning C4101: 'channel': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2796,8): warning C4101: 'cel': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2955,8): warning C4101: 'pDest': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2956,8): warning C4101: 'indic': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2954,8): warning C4101: 'pText': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2957,12): warning C4101: 'h1': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2957,16): warning C4101: 'h2': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2957,8): warning C4101: 'nb': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3066,12): warning C4101: 'world': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3066,25): warning C4101: 'total': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3066,32): warning C4101: 'mission': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3066,19): warning C4101: 'time': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3204,8): warning C4101: 'doors': unreferenced local variable - jauge.cpp -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\def.h(241,9): warning C4005: 'MAXMOVEOBJECT': macro redefinition -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\def.h(480,9): warning C4005: 'WM_PHASE_PRIVATE': macro redefinition -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.h(29,9): warning C4005: 'MAXMOVEOBJECT': macro redefinition -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\jauge.cpp(78,26): warning C4293: '<<': shift count negative or too big, undefined behavior - menu.cpp -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\def.h(241,9): warning C4005: 'MAXMOVEOBJECT': macro redefinition -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\def.h(480,9): warning C4005: 'WM_PHASE_PRIVATE': macro redefinition -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\resource.h(106,9): warning C4005: 'TX_SHOWNEXT': macro redefinition -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.h(29,9): warning C4005: 'MAXMOVEOBJECT': macro redefinition - misc.cpp -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\def.h(241,9): warning C4005: 'MAXMOVEOBJECT': macro redefinition -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\def.h(480,9): warning C4005: 'WM_PHASE_PRIVATE': macro redefinition - movie.cpp -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\def.h(241,9): warning C4005: 'MAXMOVEOBJECT': macro redefinition -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\def.h(480,9): warning C4005: 'WM_PHASE_PRIVATE': macro redefinition - network.cpp - pixmap.cpp + pixmap.cpp C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\def.h(241,9): warning C4005: 'MAXMOVEOBJECT': macro redefinition C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\def.h(480,9): warning C4005: 'WM_PHASE_PRIVATE': macro redefinition C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\resource.h(106,9): warning C4005: 'TX_SHOWNEXT': macro redefinition @@ -152,40 +18,6 @@ C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\blupi C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\blupi.cpp(802,17): warning C4101: 'timeStep': unreferenced local variable C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\pixmap.cpp(966,29): warning C4293: '<<': shift count negative or too big, undefined behavior C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\pixmap.cpp(1093,11): warning C4018: '<': signed/unsigned mismatch - sound.cpp -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\def.h(241,9): warning C4005: 'MAXMOVEOBJECT': macro redefinition -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\def.h(480,9): warning C4005: 'WM_PHASE_PRIVATE': macro redefinition -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\resource.h(106,9): warning C4005: 'TX_SHOWNEXT': macro redefinition -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\sound.cpp(69,5): warning C4002: too many arguments for function-like macro invocation 'TRY_DS' -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\sound.cpp(259,3): warning C4838: conversion from 'unsigned int' to 'int' requires a narrowing conversion -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\sound.cpp(260,3): warning C4838: conversion from 'unsigned int' to 'int' requires a narrowing conversion -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\sound.cpp(261,3): warning C4838: conversion from 'unsigned int' to 'int' requires a narrowing conversion -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\sound.cpp(262,3): warning C4838: conversion from 'unsigned int' to 'int' requires a narrowing conversion -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\sound.cpp(263,3): warning C4838: conversion from 'unsigned int' to 'int' requires a narrowing conversion -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\sound.cpp(264,3): warning C4838: conversion from 'unsigned int' to 'int' requires a narrowing conversion -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\sound.cpp(265,3): warning C4838: conversion from 'unsigned int' to 'int' requires a narrowing conversion -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\sound.cpp(266,3): warning C4838: conversion from 'unsigned int' to 'int' requires a narrowing conversion -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\sound.cpp(267,3): warning C4838: conversion from 'unsigned int' to 'int' requires a narrowing conversion -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\sound.cpp(268,3): warning C4838: conversion from 'unsigned int' to 'int' requires a narrowing conversion -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\sound.cpp(269,3): warning C4838: conversion from 'unsigned int' to 'int' requires a narrowing conversion -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\sound.cpp(270,3): warning C4838: conversion from 'unsigned int' to 'int' requires a narrowing conversion -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\sound.cpp(271,3): warning C4838: conversion from 'unsigned int' to 'int' requires a narrowing conversion - text.cpp -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\def.h(241,9): warning C4005: 'MAXMOVEOBJECT': macro redefinition -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\def.h(480,9): warning C4005: 'WM_PHASE_PRIVATE': macro redefinition -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\text.cpp(120,6): warning C4101: 'width': unreferenced local variable -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\text.cpp(119,8): warning C4101: 'pos1': unreferenced local variable - wave.cpp - Generating Code... -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2327,1): warning C4715: 'CEvent::TreatEventBase': not all control paths return a value -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2163,1): warning C4715: 'CEvent::DrawButtons': not all control paths return a value -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2812,1): warning C4715: 'CEvent::BuildDown': not all control paths return a value -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2766,1): warning C4715: 'CEvent::ChangePhase': not all control paths return a value -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(5306,1): warning C4715: 'CDecor::BlupiIsGround': not all control paths return a value -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(7850,1): warning C4700: uninitialized local variable 'tinyPoint' used -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(8229,1): warning C4715: 'CDecor::MoveObjectDetect': not all control paths return a value -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(8374,1): warning C4700: uninitialized local variable 'moveObject' used -C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\button.cpp(127,1): warning C4715: 'CButton::Create': not all control paths return a value LINK : warning LNK4075: ignoring '/INCREMENTAL' due to '/FORCE' specification Starting pass 1 Processed /DEFAULTLIB:winmm.lib @@ -313,11 +145,11 @@ pixmap.obj : warning LNK4006: "unsigned int g_lastPhase" (?g_lastPhase@@3IA) alr Referenced in blupi.obj Referenced in pixmap.obj Loaded user32.lib(USER32.dll) - Found __imp__DispatchMessageW@4 + Found __imp__DispatchMessageA@4 Referenced in blupi.obj Referenced in pixmap.obj Loaded user32.lib(USER32.dll) - Found __imp__PeekMessageW@20 + Found __imp__PeekMessageA@20 Referenced in blupi.obj Referenced in pixmap.obj Loaded user32.lib(USER32.dll) @@ -886,13 +718,14 @@ pixmap.obj : warning LNK4006: "unsigned int g_lastPhase" (?g_lastPhase@@3IA) alr Referenced in movie.obj Loaded vcruntimed.lib(VCRUNTIME140D.dll) Found _memset + Referenced in pixmap.obj Referenced in sound.obj Referenced in wave.obj Referenced in MSVCRTD.lib(utility_desktop.obj) Referenced in ddutil.obj + Referenced in decor.obj Referenced in event.obj Referenced in network.obj - Referenced in pixmap.obj Loaded vcruntimed.lib(VCRUNTIME140D.dll) Found _memcpy Referenced in decor.obj @@ -1435,26 +1268,26 @@ pixmap.obj : warning LNK4006: "unsigned int g_lastPhase" (?g_lastPhase@@3IA) alr /v /x /fo - "C:\Users\JonAd\AppData\Local\Temp\lnk{FE387DAC-7DF7-4AED-B135-37917BFD0FC9}.tmp" - "C:\Users\JonAd\AppData\Local\Temp\lnk{DD9C9A18-8AE5-4EE2-9153-B979DAAE8377}.tmp" + "C:\Users\JonAd\AppData\Local\Temp\lnk{ABF009F6-B42D-4318-81BB-32D6108B0037}.tmp" + "C:\Users\JonAd\AppData\Local\Temp\lnk{89635A46-62E7-4CF8-920E-4AC0BF3BDCDE}.tmp" Microsoft (R) Windows (R) Resource Compiler Version 10.0.10011.16384 Copyright (C) Microsoft Corporation. All rights reserved. Using codepage 1252 as default - Creating C:\Users\JonAd\AppData\Local\Temp\lnk{FE387DAC-7DF7-4AED-B135-37917BFD0FC9}.tmp + Creating C:\Users\JonAd\AppData\Local\Temp\lnk{ABF009F6-B42D-4318-81BB-32D6108B0037}.tmp - C:\Users\JonAd\AppData\Local\Temp\lnk{DD9C9A18-8AE5-4EE2-9153-B979DAAE8377}.tmp. + C:\Users\JonAd\AppData\Local\Temp\lnk{89635A46-62E7-4CF8-920E-4AC0BF3BDCDE}.tmp. Writing 24:1, lang:0x409, size 381 Invoking cvtres.exe: /machine:x86 /verbose - /out:"C:\Users\JonAd\AppData\Local\Temp\lnk{A8A240E8-A2CF-45E9-B17F-F3CB8B230A21}.tmp" + /out:"C:\Users\JonAd\AppData\Local\Temp\lnk{FAF79281-8B26-4257-90AD-33BE88C71D1A}.tmp" /readonly "Speedy E.e424a3cb\Debug\Eggbert2.res" - "C:\Users\JonAd\AppData\Local\Temp\lnk{FE387DAC-7DF7-4AED-B135-37917BFD0FC9}.tmp" + "C:\Users\JonAd\AppData\Local\Temp\lnk{ABF009F6-B42D-4318-81BB-32D6108B0037}.tmp" Microsoft (R) Windows Resource To Object Converter Version 14.40.33811.0 Copyright (C) Microsoft Corporation. All rights reserved. diff --git a/Speedy E.e424a3cb/Debug/blupi.obj b/Speedy E.e424a3cb/Debug/blupi.obj index e9394f3..9b40733 100644 Binary files a/Speedy E.e424a3cb/Debug/blupi.obj and b/Speedy E.e424a3cb/Debug/blupi.obj differ diff --git a/Speedy E.e424a3cb/Debug/button.obj b/Speedy E.e424a3cb/Debug/button.obj index c7052c1..d709010 100644 Binary files a/Speedy E.e424a3cb/Debug/button.obj and b/Speedy E.e424a3cb/Debug/button.obj differ diff --git a/Speedy E.e424a3cb/Debug/decor.obj b/Speedy E.e424a3cb/Debug/decor.obj index c6bea6d..4654239 100644 Binary files a/Speedy E.e424a3cb/Debug/decor.obj and b/Speedy E.e424a3cb/Debug/decor.obj differ diff --git a/Speedy E.e424a3cb/Debug/event.obj b/Speedy E.e424a3cb/Debug/event.obj index 59cf98e..a86ac15 100644 Binary files a/Speedy E.e424a3cb/Debug/event.obj and b/Speedy E.e424a3cb/Debug/event.obj differ diff --git a/Speedy E.e424a3cb/Debug/jauge.obj b/Speedy E.e424a3cb/Debug/jauge.obj index 8d9c9f9..80ad756 100644 Binary files a/Speedy E.e424a3cb/Debug/jauge.obj and b/Speedy E.e424a3cb/Debug/jauge.obj differ diff --git a/Speedy E.e424a3cb/Debug/menu.obj b/Speedy E.e424a3cb/Debug/menu.obj index 1f4bb16..c12d326 100644 Binary files a/Speedy E.e424a3cb/Debug/menu.obj and b/Speedy E.e424a3cb/Debug/menu.obj differ diff --git a/Speedy E.e424a3cb/Debug/pixmap.obj b/Speedy E.e424a3cb/Debug/pixmap.obj index 140e32a..6c31412 100644 Binary files a/Speedy E.e424a3cb/Debug/pixmap.obj and b/Speedy E.e424a3cb/Debug/pixmap.obj differ diff --git a/Speedy E.e424a3cb/Debug/vc143.idb b/Speedy E.e424a3cb/Debug/vc143.idb index 88582de..b87def3 100644 Binary files a/Speedy E.e424a3cb/Debug/vc143.idb and b/Speedy E.e424a3cb/Debug/vc143.idb differ diff --git a/Speedy E.e424a3cb/Debug/vc143.pdb b/Speedy E.e424a3cb/Debug/vc143.pdb index 2e90bb4..087a020 100644 Binary files a/Speedy E.e424a3cb/Debug/vc143.pdb and b/Speedy E.e424a3cb/Debug/vc143.pdb differ diff --git a/blupi.cpp b/blupi.cpp index afe058a..3127903 100644 --- a/blupi.cpp +++ b/blupi.cpp @@ -223,7 +223,7 @@ BOOL ReadConfig (LPSTR lpCmdLine) { g_bBenchmarkSuccess = FALSE; } - if (g_bBenchmarkSuccess = FALSE) + if (g_bBenchmarkSuccess == FALSE) { g_bTrueColorBack = FALSE; g_bTrueColorDecor = FALSE; @@ -268,7 +268,7 @@ void UpdateFrame(void) g_pEvent->DemoStep(); // d�marre �v. d�mo automatique } - if (phase == WM_PHASE_PLAYMOVIE || phase == WM_PHASE_WINMOVIE || WM_PHASE_WINMOVIEDESIGN || WM_PHASE_WINMOVIEMULTI) + if (phase == WM_PHASE_PLAYMOVIE || phase == WM_PHASE_WINMOVIE || phase == WM_PHASE_WINMOVIEDESIGN || phase == WM_PHASE_WINMOVIEMULTI) { g_pEvent->MovieToStart(); } @@ -479,7 +479,7 @@ LRESULT CALLBACK WindowProc (HWND hWnd, UINT message, totalDim.y = 66; iconDim.x = 64; iconDim.y = 66/2; - g_pPixmap->Cache2(CHLITTLE, "image16\\little.blp", totalDim, iconDim, TRUE); + g_pPixmap->Cache2(CHLITTLE, "little.blp", totalDim, iconDim, TRUE); g_pPixmap->SetTransparent(CHLITTLE, RGB(0,0,255)); g_pPixmap->SavePalette(); @@ -811,14 +811,14 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, while ( TRUE ) { - if ( PeekMessage(&msg, NULL, 0,0, PM_NOREMOVE) ) + if ( PeekMessageA(&msg, NULL, 0,0, PM_NOREMOVE) ) { if ( !GetMessage(&msg, NULL, 0, 0) ) { return msg.wParam; } TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageA(&msg); } else { diff --git a/decor.cpp b/decor.cpp index 25ccd8d..ac28d90 100644 --- a/decor.cpp +++ b/decor.cpp @@ -40,18 +40,15 @@ CDecor::CDecor() m_hWnd = NULL; m_pSound = NULL; m_pPixmap = NULL; - - for (int i = 0; i < 200; i++) - { - m_lastDecorIcon[i] = 0; - } + memset(m_lastDecorIcon, 0, 800); m_lastRegion = 0; + m_menuType = 0; m_time = 0; - m_bAllMissions = FALSE; - m_bInvincible = FALSE; - m_bShowSecret = FALSE; - m_bAccessBuild = FALSE; - m_bNetPacked = FALSE; + m_bAllMissions = FALSE; // m_bCheatDoors + m_bInvincible = FALSE; // m_bSuperBlupi + m_bShowSecret = FALSE; // m_bDrawSecret + m_bAccessBuild = FALSE; // m_buildOfficialMissions + m_bNetPacked = FALSE; m_bNetMovePredict = TRUE; m_bNetDebug = FALSE; m_bMulti = FALSE; @@ -111,11 +108,7 @@ BOOL CDecor::LoadImages() iconDim.x = DIMCELX * 2; iconDim.y = DIMCELY * 2; sprintf(filename, "decor%.3d.blp", m_region); - if (!m_pPixmap->Cache2(CHBACK, filename, totalDim, iconDim, FALSE)) return FALSE; - if (m_region == 0) - { - return FALSE; - } + if (!m_pPixmap->BackgroundCache(CHBACK, filename, totalDim, iconDim, FALSE)) return FALSE; return TRUE; } @@ -125,14 +118,7 @@ void CDecor::InitGamer() BYTE* door; m_nbVies = 3; - - door = m_doors; - - for (i != 0; i = 50; i++) - { - *(int*)door = 0x1010101; - door = door + 4; - } + memset(m_doors, 1, 200); return; } @@ -856,7 +842,23 @@ void CDecor::AdaptMotorVehicleSound() return; } +/* +POINT CDecor::ScreenPosToCelPos(POINT* pos, POINT cel) +{ + POINT res; + if (cel.x < 0 || cel.x >= LXIMAGE || cel.y < 0 || cel.y >= LYIMAGE) + { + pos->x = 0xFFFFFFFF; + pos->y = 0xFFFFFFFF; + res.x = (LONG)pos; + } + else + { + + } +} +*/ void CDecor::DeleteCel(int celX, int celY) { diff --git a/decor.h b/decor.h index a1d01bb..ea7995e 100644 --- a/decor.h +++ b/decor.h @@ -712,6 +712,7 @@ public: int MockeryDetect(POINT pos); BOOL BlupiElectro(POINT pos); void BlupiStep(); + POINT ScreenPosToCelPos(POINT* pos, POINT cel); BOOL DecorDetect(RECT rect); BOOL DecorDetect(RECT rect, BOOL bCaisse); BOOL SearchDoor(int n, POINT cel, POINT blupi); @@ -925,7 +926,7 @@ protected: int m_netMessageIndex1; int m_netMessageIndex2; int m_netMessageIndex3; - + int m_menuType; char m_messages[4][100]; int m_air; int m_energyUnused; diff --git a/pixmap.cpp b/pixmap.cpp index 2fb6aa0..4b742dc 100644 --- a/pixmap.cpp +++ b/pixmap.cpp @@ -899,14 +899,14 @@ BOOL CPixmap::BackgroundCache(int channel, const char* pFilename, POINT totalDim } strcpy(file, "image16\\"); strcat(file, pFilename); - if (Cache(channel, file, totalDim, iconDim, FALSE)) + if (Cache2(channel, file, totalDim, iconDim, FALSE)) { return TRUE; } LABEL1: strcpy(file, "image08\\"); strcat(file, (char*)pFilename); - return Cache(channel, file, totalDim, iconDim, bUsePalette); + return Cache2(channel, file, totalDim, iconDim, bUsePalette); } BOOL CPixmap::CacheAll(BOOL cache, HWND hWnd, BOOL bFullScreen, BOOL bTrueColor, BOOL bTrueColorDecor, int mouseType, const char* pFilename, int region)