diff --git a/DATA/bench.blp b/DATA/bench.blp index 433dbeb..838d967 100644 --- a/DATA/bench.blp +++ b/DATA/bench.blp @@ -1 +1 @@ -Benchmark = 1 +Benchmark = 0 diff --git a/DATA/time.blp b/DATA/time.blp index 6bae641..5f1a3e2 100644 --- a/DATA/time.blp +++ b/DATA/time.blp @@ -1 +1 @@ -CheckTime = 196 Memory = 2147483647 +CheckTime = 240 Memory = 2147483647 diff --git a/Debug/Speedy Eggbert 2 Source.exe b/Debug/Speedy Eggbert 2 Source.exe index 130903e..67425eb 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 0377e49..3f79205 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 d337b3b..680eee0 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 b9df311..e99de7a 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 155cd57..311f1ea 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 Eggbert 2 Source.log b/Speedy E.e424a3cb/Debug/Speedy Eggbert 2 Source.log index 67a7924..7b7a742 100644 --- a/Speedy E.e424a3cb/Debug/Speedy Eggbert 2 Source.log +++ b/Speedy E.e424a3cb/Debug/Speedy Eggbert 2 Source.log @@ -1,4 +1,164 @@ -LINK : warning LNK4075: ignoring '/INCREMENTAL' due to '/FORCE' specification + blupi.cpp + 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(484,9): warning C4005: 'WM_PHASE_PRIVATE': macro redefinition +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\resource.h(110,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(91,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(249,25): warning C4101: 'targetlevel': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\blupi.cpp(245,24): warning C4101: 'rcRect': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\blupi.cpp(245,18): warning C4101: 'clip': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\blupi.cpp(249,9): warning C4101: 'i': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\blupi.cpp(248,10): warning C4101: 'posMouse': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\blupi.cpp(353,8): warning C4101: 'test': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\blupi.cpp(352,8): warning C4101: 'posMouse': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\blupi.cpp(619,11): warning C4101: 'dest': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\blupi.cpp(617,13): warning C4101: 'i': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\blupi.cpp(618,10): warning C4101: 'rect': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\blupi.cpp(655,11): warning C4101: 'rcRect': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\blupi.cpp(817,17): warning C4101: 'timeStep': unreferenced local variable +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(484,9): warning C4005: 'WM_PHASE_PRIVATE': macro redefinition +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\pixmap.h(12,9): warning C4005: 'DIRECTDRAW_VERSION': 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(107,6): warning C4101: 'toolTips': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\button.cpp(130,8): warning C4101: 'rect': unreferenced local variable + 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(484,9): warning C4005: 'WM_PHASE_PRIVATE': macro redefinition +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\resource.h(110,9): warning C4005: 'TX_SHOWNEXT': macro redefinition +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\pixmap.h(12,9): warning C4005: 'DIRECTDRAW_VERSION': 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(91,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(25,9): warning C4005: 'DIRECTDRAW_VERSION': macro redefinition +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(119,8): warning C4101: 'door': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(118,8): warning C4101: 'i': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(129,9): warning C4101: 'i': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(540,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(565,10): warning C4101: 'text': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(1080,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(1315,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(1568,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(6569,8): warning C4101: 'type2': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(6602,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(6625,6): warning C4101: 'players': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(6740,7): warning C4101: 'rect2': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(6739,10): warning C4101: 'rect1': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(6741,7): warning C4101: 'rect3': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(6757,26): warning C4309: '=': truncation of constant value +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(6758,26): warning C4309: '=': truncation of constant value +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(6771,25): warning C4309: '=': truncation of constant value +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(6772,25): warning C4309: '=': truncation of constant value +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(6852,13): warning C4101: 'moveObject': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(8174,9): warning C4101: 'tinyRect': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(8229,7): warning C4101: 'tinyRect': 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(8287,9): warning C4101: 'src3': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(8317,9): warning C4101: 'tinyRect': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(8345,9): warning C4101: 'tinyRect': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(8373,9): warning C4101: 'tinyRect': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(8856,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(9110,16): warning C4129: '%': unrecognized character escape sequence +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(9114,15): warning C4129: 'w': unrecognized character escape sequence +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(9126,8): warning C4101: 'num2': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(9127,10): warning C4101: 'num3': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(9125,15): warning C4101: 'num': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(9125,8): warning C4101: 'nb': unreferenced local variable + 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(484,9): warning C4005: 'WM_PHASE_PRIVATE': macro redefinition +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\resource.h(110,9): warning C4005: 'TX_SHOWNEXT': macro redefinition +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\pixmap.h(12,9): warning C4005: 'DIRECTDRAW_VERSION': 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(91,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(1266,7): warning C4101: 'menuIndex': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(1345,13): warning C4101: 'pos': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(1504,13): warning C4101: 'i': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(1597,10): warning C4552: '!=': result of expression not used +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(1802,9): warning C4101: 'data': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(1889,8): warning C4101: 'element': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(1887,8): warning C4101: 'stream': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(1941,14): 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\event.cpp(1959,8): warning C4101: 'textLeft': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(1955,57): warning C4101: 'icon': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(1955,17): warning C4101: 'world': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(1953,17): warning C4101: 'levels': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(1965,11): warning C4101: 'phase': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(1955,42): warning C4101: 'volume': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(1955,24): warning C4101: 'time': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(1954,17): warning C4101: 'types': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(1964,17): warning C4101: 'bEnable': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(1955,50): warning C4101: 'pente': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(1955,34): warning C4101: 'button': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2598,12): warning C4552: '|': result of expression not used +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2600,12): warning C4552: '|': result of expression not used +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2603,12): warning C4552: '|': result of expression not used +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2606,12): warning C4552: '|': result of expression not used +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2609,12): warning C4552: '|': result of expression not used +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2625,12): warning C4552: '|': result of expression not used +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2793,45): warning C4806: '&': unsafe operation: no value of type 'bool' promoted to type 'int' can equal the given constant +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2793,48): warning C4552: '+': result of expression not used +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2428,10): warning C4101: 'sound': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(2970,21): warning C4101: 'sound': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3095,8): warning C4101: 'pTerm': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3091,29): warning C4101: 'max': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3091,14): warning C4101: 'state': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3091,21): warning C4101: 'volume': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3093,8): warning C4101: 'pButtonExist': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3091,6): warning C4101: 'button': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3191,7): warning C4101: 'bUser': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3216,7): warning C4101: 'bUser': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3259,8): warning C4101: 'pTerm': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3254,15): warning C4101: 'music': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3263,8): warning C4101: 'res': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3255,18): warning C4101: 'iconDim': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3255,8): warning C4101: 'totalDim': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3256,8): warning C4101: 'filename': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3261,8): warning C4101: 'doors': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3257,8): warning C4101: 'pButtonExist': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3254,25): warning C4101: 'j': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3254,22): warning C4101: 'i': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3258,8): warning C4101: 'bEnable': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3262,8): warning C4101: 'text': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3258,17): warning C4101: 'bHide': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3254,28): warning C4101: 'nb': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3523,23): warning C4101: 'icon': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3523,14): warning C4101: 'channel': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3522,8): warning C4101: 'cel': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3654,8): warning C4101: 'pDest': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3655,8): warning C4101: 'indic': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3653,8): warning C4101: 'pText': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3656,12): warning C4101: 'h1': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3656,16): warning C4101: 'h2': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3656,8): warning C4101: 'nb': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3765,12): warning C4101: 'world': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3765,25): warning C4101: 'total': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3765,32): warning C4101: 'mission': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3765,19): warning C4101: 'time': unreferenced local variable +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3903,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(484,9): warning C4005: 'WM_PHASE_PRIVATE': macro redefinition +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\pixmap.h(12,9): warning C4005: 'DIRECTDRAW_VERSION': 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(484,9): warning C4005: 'WM_PHASE_PRIVATE': macro redefinition +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\resource.h(110,9): warning C4005: 'TX_SHOWNEXT': macro redefinition +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\pixmap.h(12,9): warning C4005: 'DIRECTDRAW_VERSION': macro redefinition +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.h(29,9): warning C4005: 'MAXMOVEOBJECT': macro redefinition + Generating Code... +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(1948,1): warning C4715: 'CEvent::PlaceMenu': not all control paths return a value +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\event.cpp(3538,1): warning C4715: 'CEvent::BuildDown': not all control paths return a value +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(894,1): warning C4700: uninitialized local variable 'thing' used +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(5344,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(7917,1): warning C4700: uninitialized local variable 'tinyPoint' used +C:\Users\JonAd\source\repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\decor.cpp(8295,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(8441,1): warning C4700: uninitialized local variable 'moveObject' used +LINK : warning LNK4075: ignoring '/INCREMENTAL' due to '/FORCE' specification Starting pass 1 Processed /DEFAULTLIB:winmm.lib Processed /DEFAULTLIB:uuid.lib @@ -1266,26 +1426,26 @@ pixmap.obj : warning LNK4006: "unsigned int g_lastPhase" (?g_lastPhase@@3IA) alr /v /x /fo - "C:\Users\JonAd\AppData\Local\Temp\lnk{59B8D86E-F3D5-45C5-BB9C-3D309FE8F8BA}.tmp" - "C:\Users\JonAd\AppData\Local\Temp\lnk{FEBC0BF5-1EE7-4094-8F2E-5AB465A98650}.tmp" + "C:\Users\JonAd\AppData\Local\Temp\lnk{F530357C-F958-4A25-9BF5-5F68DB3AEFAC}.tmp" + "C:\Users\JonAd\AppData\Local\Temp\lnk{8199161C-4050-4027-9916-6058EBF5A68C}.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{59B8D86E-F3D5-45C5-BB9C-3D309FE8F8BA}.tmp + Creating C:\Users\JonAd\AppData\Local\Temp\lnk{F530357C-F958-4A25-9BF5-5F68DB3AEFAC}.tmp - C:\Users\JonAd\AppData\Local\Temp\lnk{FEBC0BF5-1EE7-4094-8F2E-5AB465A98650}.tmp. + C:\Users\JonAd\AppData\Local\Temp\lnk{8199161C-4050-4027-9916-6058EBF5A68C}.tmp. Writing 24:1, lang:0x409, size 381 Invoking cvtres.exe: /machine:x86 /verbose - /out:"C:\Users\JonAd\AppData\Local\Temp\lnk{F1E1E521-9AF2-4A2C-B7F5-C488CCDE62D1}.tmp" + /out:"C:\Users\JonAd\AppData\Local\Temp\lnk{7FE57D8A-3AF9-402E-81BA-655B99D5438A}.tmp" /readonly "Speedy E.e424a3cb\Debug\Eggbert2.res" - "C:\Users\JonAd\AppData\Local\Temp\lnk{59B8D86E-F3D5-45C5-BB9C-3D309FE8F8BA}.tmp" + "C:\Users\JonAd\AppData\Local\Temp\lnk{F530357C-F958-4A25-9BF5-5F68DB3AEFAC}.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 2519ce1..63d23b6 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 20520a7..ea0766d 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 18dd8b2..a7d440d 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 1e2fb85..92dbf8b 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 1b48726..77feb41 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 78be4b6..7cdb6e9 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/vc143.idb b/Speedy E.e424a3cb/Debug/vc143.idb index 6a32b2a..dfcd040 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 76e96ef..deb1674 100644 Binary files a/Speedy E.e424a3cb/Debug/vc143.pdb and b/Speedy E.e424a3cb/Debug/vc143.pdb differ diff --git a/button.cpp b/button.cpp index 0bdbace..9e7bd8e 100644 --- a/button.cpp +++ b/button.cpp @@ -355,7 +355,7 @@ BOOL CButton::MouseDown(POINT pos) m_mouseState = 1; m_bMouseDown = TRUE; m_bRedraw = TRUE; - PostMessage(m_hWnd, WM_UPDATE, 0, 0); +// PostMessage(m_hWnd, WM_UPDATE, 0, 0); m_pSound->PlayImage(SOUND_1_CLICK, pos); return TRUE; diff --git a/decor.cpp b/decor.cpp index 167ed93..3324ce0 100644 --- a/decor.cpp +++ b/decor.cpp @@ -842,6 +842,35 @@ void CDecor::AdaptMotorVehicleSound() return; } +void CDecor::ChangePhase(UINT phase) +{ + int channel; + POINT pos; + + pos.x = LXIMAGE / 2; + pos.y = LYIMAGE / 2; + + m_phase = phase; + if ((phase == WM_PHASE_PLAY) || (phase == WM_PHASE_PLAYTEST)) + { + channel = -1; + if (m_bHelicopterFlying != FALSE) channel = 16; + if (m_bHelicopterStationary != FALSE) channel = 18; + if (m_bJeepMarch != FALSE) channel = 29; + if (m_bJeepStop != FALSE) channel = 31; + if (channel != -1) + m_pSound->PlayImage(channel, pos, -1); + } + else + { + if (m_bHelicopterFlying != FALSE) m_pSound->StopSound(SOUND_16_HELICOHIGH); + if (m_bHelicopterStationary != FALSE) m_pSound->StopSound(SOUND_18_HELICOLOW); + if (m_bJeepMarch != FALSE) m_pSound->StopSound(SOUND_29_JEEPHIGH); + if (m_bJeepStop != FALSE) m_pSound->StopSound(SOUND_31_JEEPLOW); + return; + } + return; +} POINT CDecor::ScreenPosToCelPos(POINT* pos, POINT cel) { diff --git a/decor.h b/decor.h index 2c28987..03aa013 100644 --- a/decor.h +++ b/decor.h @@ -741,7 +741,7 @@ public: BOOL SomethingMissionPath(int user, int mission, BOOL bUser); void MoveObjectPriority(int i); void FindAndSetMenus(int menuIndex, int menuType); - + void ChangePhase(UINT phase); // Network Related Functions diff --git a/event.cpp b/event.cpp index 5bca165..dc17bab 100644 --- a/event.cpp +++ b/event.cpp @@ -3451,6 +3451,12 @@ BOOL CEvent::ChangePhase(UINT phase) m_menu.Delete(); WaitMouse(FALSE); + + if ((m_phase == WM_PHASE_PLAY) || (m_phase == WM_PHASE_PLAYTEST)) + { + FillMouse(TRUE); + } + m_pDecor->ChangePhase(phase); return TRUE; }