Skip to content

Commit 0d4b9f7

Browse files
committed
Small fixes and install file cleanup
1 parent fef266e commit 0d4b9f7

File tree

4 files changed

+27
-13
lines changed

4 files changed

+27
-13
lines changed

release.iss

+10-8
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,21 @@
77
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING .ISS SCRIPT FILES!
88

99
[Setup]
10-
AppName=M'Overlay
11-
AppId=M'Overlay
12-
AppVersion=1.5.5
10+
#define AppName "M'Overlay"
11+
#define AppVersion "1.5.5"
12+
AppName={#AppName}
13+
AppId={#AppName}
14+
AppVersion={#AppVersion}
1315
WizardStyle=modern
14-
DefaultDirName={autopf}\M'Overlay
15-
DefaultGroupName=M'Overlay
16+
DefaultDirName={autopf}\{#AppName}
17+
DefaultGroupName={#AppName}
1618
UninstallDisplayIcon={app}\m-overlay-64.exe
1719
SetupIconFile=installer/icon.ico
1820
WizardSmallImageFile=installer/wizard.bmp
1921
Compression=lzma2
2022
SolidCompression=yes
2123
OutputDir=./releases
22-
OutputBaseFilename=M'Overlay - installer (x64)
24+
OutputBaseFilename={#AppName} - installer ({#AppVersion})
2325
; "ArchitecturesAllowed=x64" specifies that Setup cannot run on
2426
; anything but x64.
2527
ArchitecturesAllowed=x64
@@ -41,7 +43,7 @@ Source: "build/x64/OpenAL32.dll"; DestDir: "{app}"; DestName: "OpenAL32.dll"; Fl
4143
Source: "build/x64/SDL2.dll"; DestDir: "{app}"; DestName: "SDL2.dll"; Flags: ignoreversion
4244

4345
[Icons]
44-
Name: "{group}\M'Overlay"; Filename: "{app}\m-overlay-64.exe"
46+
Name: "{group}\{#AppName}"; Filename: "{app}\m-overlay-64.exe"
4547

4648
[Run]
47-
Filename: {app}\m-overlay-64.exe; Description: "Launch M'Overlay"; Flags: postinstall shellexec skipifsilent nowait
49+
Filename: {app}\m-overlay-64.exe; Description: "Launch {#AppName}"; Flags: postinstall shellexec skipifsilent nowait

source/main.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -228,9 +228,9 @@ function love.wheelmoved(x, y)
228228
end
229229

230230
if y > 0 then
231-
PORT = PORT + 1
232-
elseif y < 0 then
233231
PORT = PORT - 1
232+
elseif y < 0 then
233+
PORT = PORT + 1
234234
end
235235
PORT = PORT % MAX_PORTS
236236
PORT_DISPLAY_OVERRIDE = nil

source/melee.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@ function melee.getPlayer(port)
543543
if melee.isSinglePlayerGame() and port == memory.menu.player_one_port + 1 then
544544
-- Single player games in CSS screen always use PORT 1 character info no matter what port is controlling the menus
545545
return memory.player[1].select
546-
else if not melee.isInGame() then
546+
elseif not melee.isInGame() then
547547
return memory.player[port].select
548548
end
549549

source/modules/games/GALE01-2.lua

+14-2
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,15 @@ local player_static_addresses = {
6262

6363
local player_static_struct = {
6464
[0x004] = { type = "u32", name = "character" },
65+
--[0x008] = { type = "u32", name = "mode" },
6566
[0x00C] = { type = "u16", name = "transformed" },
6667
[0x044] = { type = "u8", name = "skin" },
68+
--[0x045] = { type = "u8", name = "port" },
6769
[0x046] = { type = "u8", name = "color" },
6870
[0x047] = { type = "u8", name = "team" },
71+
--[0x048] = { type = "u8", name = "index" },
72+
--[0x049] = { type = "u8", name = "cpu_level", debug = true },
73+
--[0x04A] = { type = "u8", name = "cpu_type", debug = true }, -- 4 = 20XX, 22 = normalish, 19 = Alt Normal
6974
}
7075

7176
for id, address in ipairs(player_static_addresses) do
@@ -90,6 +95,8 @@ for id, address in ipairs(player_static_addresses) do
9095
name = ("player.%i.%s"):format(id, name),
9196
struct = {
9297
[0x60 + 0x0004] = { type = "u32", name = "character" },
98+
--[0x60 + 0x000C] = { type = "u8", name = "port" },
99+
--[0x60 + 0x0618] = { type = "u8", name = "index" },
93100
[0x60 + 0x0619] = { type = "u8", name = "skin" },
94101
[0x60 + 0x061A] = { type = "u8", name = "color" },
95102
[0x60 + 0x061B] = { type = "u8", name = "team" },
@@ -101,6 +108,11 @@ for id, address in ipairs(player_static_addresses) do
101108
[0x60 + 0x0650] = { type = "float", name = "controller.analog.float" },
102109
[0x60 + 0x065C] = { type = "u32", name = "controller.buttons.pressed" },
103110
[0x60 + 0x0660] = { type = "u32", name = "controller.buttons.pressed_previous" },
111+
112+
--[[
113+
[0x60 + 0x1A94] = { type = "u32", name = "cpu_type" },
114+
[0x60 + 0x1A98] = { type = "u32", name = "cpu_level" },
115+
]]
104116
},
105117
}
106118
end
@@ -130,8 +142,8 @@ game.memorymap[CSSDT_BUF_ADDR] = {
130142
[0x040] = { type = "u8", name = "connection_state" },
131143
[0x041] = { type = "u8", name = "local_player.ready" },
132144
[0x042] = { type = "u8", name = "remote_player.ready" },
133-
[0x043] = { type = "u8", name = "local_player.index", debug = true },
134-
[0x044] = { type = "u8", name = "remote_player.index", debug = true },
145+
[0x043] = { type = "u8", name = "local_player.index" },
146+
[0x044] = { type = "u8", name = "remote_player.index" },
135147
[0x045] = { type = "u32", name = "rng_offset" },
136148
[0x049] = { type = "u8", name = "delay_frames" },
137149
--[0x04A] = { type = "data", size = 31, name = "player.1.name" },

0 commit comments

Comments
 (0)