Skip to content

Commit 713c369

Browse files
cfrankbcfrankb
committed
latest update
1 parent cfd793e commit 713c369

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+4181
-987
lines changed

‎.github/workflows/windows_release.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ on:
44
push:
55
branches:
66
- "master"
7-
# - "continuous-integration"
7+
- "develop"
8+
# - "continuous-integration"
89
tags:
910
- "v*"
1011
pull_request:
1112
branches:
1213
- "master"
13-
# - "continuous-integration"
14+
# - "continuous-integration"
1415

1516
defaults:
1617
run:

‎CMakeLists.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cmake_minimum_required(VERSION 3.16)
2-
project(MyQtApp LANGUAGES CXX)
3-
2+
set(PROJECT_NAME "cs3-map-edit")
3+
project(${PROJECT_NAME} LANGUAGES CXX)
44
set(CMAKE_CXX_STANDARD 17)
55
set(CMAKE_CXX_STANDARD_REQUIRED ON)
66
set(CMAKE_AUTOUIC ON) # UI
@@ -49,7 +49,7 @@ set(UI_FILES
4949

5050

5151
# Create executable with Qt-aware handling
52-
qt_add_executable(MyQtApp
52+
qt_add_executable(${PROJECT_NAME}
5353
MANUAL_FINALIZATION
5454
${UI_FILES}
5555
${CPP_SOURCES}
@@ -62,7 +62,7 @@ qt_add_executable(MyQtApp
6262
add_subdirectory(external/hunspell hunspell)
6363

6464
# Link Qt libraries
65-
target_link_libraries(MyQtApp PRIVATE Qt6::Widgets)
65+
target_link_libraries(${PROJECT_NAME} PRIVATE Qt6::Widgets)
6666

6767
#find_library(XMP_LIBRARY xmp)
6868
find_library(ZLIB_LIBRARY z)
@@ -72,15 +72,15 @@ find_library(ZLIB_LIBRARY z)
7272

7373
# Optional: include Hunspell if available
7474
# find_package(Hunspell REQUIRED)
75-
target_link_libraries(MyQtApp PRIVATE hunspell z)
75+
target_link_libraries(${PROJECT_NAME} PRIVATE hunspell z)
7676

7777

78-
target_include_directories(MyQtApp PRIVATE
78+
target_include_directories(${PROJECT_NAME} PRIVATE
7979
${CMAKE_CURRENT_SOURCE_DIR}/src
8080
${CMAKE_CURRENT_SOURCE_DIR}/src/runtime
8181
${CMAKE_CURRENT_SOURCE_DIR}/src/runtime/shared
8282
${CMAKE_CURRENT_SOURCE_DIR}/external/hunspell/src/hunspell
8383
)
8484

8585
# Finalize Qt setup
86-
qt_finalize_executable(MyQtApp)
86+
qt_finalize_executable(${PROJECT_NAME})

‎packages/README.txt‎

Whitespace-only changes.

‎packages/hunspell/CMakeLists.txt‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
cmake_minimum_required(VERSION 3.14)
2+
project(hunspell_wrapper)
3+
4+
file(GLOB HUNSPELL_SOURCES
5+
src/hunspell/*.cxx
6+
)
7+
8+
add_library(hunspell STATIC ${HUNSPELL_SOURCES})
9+
10+
target_include_directories(hunspell PUBLIC
11+
${CMAKE_CURRENT_SOURCE_DIR}/src/hunspell
12+
)
13+
14+
target_compile_definitions(hunspell PRIVATE
15+
-DHUNSPELL_STATIC
16+
)

‎src/animzdata.h‎

Lines changed: 197 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,197 @@
1+
/*
2+
cs3-runtime-sdl
3+
Copyright (C) 2025 Francois Blanchette
4+
5+
This program is free software: you can redistribute it and/or modify
6+
it under the terms of the GNU General Public License as published by
7+
the Free Software Foundation, either version 3 of the License, or
8+
(at your option) any later version.
9+
10+
This program is distributed in the hope that it will be useful,
11+
but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
GNU General Public License for more details.
14+
15+
You should have received a copy of the GNU General Public License
16+
along with this program. If not, see <http://www.gnu.org/licenses/>.
17+
*/
18+
//////////////////////////////////////////////////
19+
// autogenerated
20+
21+
#pragma once
22+
23+
#define ANIMZ_SWAMP_LEN 0x02
24+
#define ANIMZ_DIAMOND_LEN 0x06
25+
#define ANIMZ_ALPHA_LEN 0x02
26+
#define ANIMZ_BLUEGHOS_LEN 0x01
27+
#define ANIMZ_DEICO_LEN 0x02
28+
#define ANIMZ_FORCEF94_LEN 0x08
29+
#define ANIMZ_INSECT1_LEN 0x08
30+
#define ANIMZ_INSECT1_DN_LEN 0x08
31+
#define ANIMZ_INSECT1_LF_LEN 0x08
32+
#define ANIMZ_INSECT1_RG_LEN 0x08
33+
#define ANIMZ_LUTIN_LEN 0x06
34+
#define ANIMZ_MANKA_LEN 0x06
35+
#define ANIMZ_OCTOPUS_LEN 0x06
36+
#define ANIMZ_OOO_LEN 0x02
37+
#define ANIMZ_TEDDY93_LEN 0x02
38+
#define ANIMZ_VAMPLANT_LEN 0x02
39+
#define ANIMZ_YAHOO_LEN 0x02
40+
#define ANIMZ_YIGA_LEN 0x02
41+
#define ANIMZ_YELKILLER_LEN 0x02
42+
#define ANIMZ_ORB_LEN 0x04
43+
#define ANIMZ_TRIFORCE_LEN 0x04
44+
#define ANIMZ_SPARKLE_LEN 0x08
45+
#define ANIMZ_MUSHROOM_LEN 0x03
46+
#define ANIMZ_MUSH_DOWN_LEN 0x03
47+
#define ANIMZ_MUSH_LEFT_LEN 0x03
48+
#define ANIMZ_MUSH_RIGHT_LEN 0x03
49+
#define ANIMZ_WHTEWORM_LEN 0x04
50+
#define ANIMZ_ETURTLE_LEN 0x04
51+
#define ANIMZ_DRAGO_LEN 0x04
52+
#define ANIMZ_EXPLOSION1_LEN 0x05
53+
#define ANIMZ_DOORS_LEAF_LEN 0x02
54+
#define ANIMZ_FIREBALL_LEN 0x04
55+
#define ANIMZ_EXPLOSION6_LEN 0x06
56+
57+
#define ANIMZ_SWAMP 0x00
58+
#define ANIMZ_SWAMP_2 0x01
59+
#define ANIMZ_DIAMOND 0x02
60+
#define ANIMZ_DIAMOND_2 0x03
61+
#define ANIMZ_DIAMOND_3 0x04
62+
#define ANIMZ_DIAMOND_4 0x05
63+
#define ANIMZ_DIAMOND_5 0x06
64+
#define ANIMZ_DIAMOND_6 0x07
65+
#define ANIMZ_ALPHA 0x08
66+
#define ANIMZ_ALPHA_2 0x09
67+
#define ANIMZ_BLUEGHOS 0x0a
68+
#define ANIMZ_DEICO 0x0b
69+
#define ANIMZ_DEICO_2 0x0c
70+
#define ANIMZ_FORCEF94 0x0d
71+
#define ANIMZ_FORCEF94_2 0x0e
72+
#define ANIMZ_FORCEF94_3 0x0f
73+
#define ANIMZ_FORCEF94_4 0x10
74+
#define ANIMZ_FORCEF94_5 0x11
75+
#define ANIMZ_FORCEF94_6 0x12
76+
#define ANIMZ_FORCEF94_7 0x13
77+
#define ANIMZ_FORCEF94_8 0x14
78+
#define ANIMZ_INSECT1 0x15
79+
#define ANIMZ_INSECT1_2 0x16
80+
#define ANIMZ_INSECT1_3 0x17
81+
#define ANIMZ_INSECT1_4 0x18
82+
#define ANIMZ_INSECT1_5 0x19
83+
#define ANIMZ_INSECT1_6 0x1a
84+
#define ANIMZ_INSECT1_7 0x1b
85+
#define ANIMZ_INSECT1_8 0x1c
86+
#define ANIMZ_INSECT1_DN 0x1d
87+
#define ANIMZ_INSECT1_DN_2 0x1e
88+
#define ANIMZ_INSECT1_DN_3 0x1f
89+
#define ANIMZ_INSECT1_DN_4 0x20
90+
#define ANIMZ_INSECT1_DN_5 0x21
91+
#define ANIMZ_INSECT1_DN_6 0x22
92+
#define ANIMZ_INSECT1_DN_7 0x23
93+
#define ANIMZ_INSECT1_DN_8 0x24
94+
#define ANIMZ_INSECT1_LF 0x25
95+
#define ANIMZ_INSECT1_LF_2 0x26
96+
#define ANIMZ_INSECT1_LF_3 0x27
97+
#define ANIMZ_INSECT1_LF_4 0x28
98+
#define ANIMZ_INSECT1_LF_5 0x29
99+
#define ANIMZ_INSECT1_LF_6 0x2a
100+
#define ANIMZ_INSECT1_LF_7 0x2b
101+
#define ANIMZ_INSECT1_LF_8 0x2c
102+
#define ANIMZ_INSECT1_RG 0x2d
103+
#define ANIMZ_INSECT1_RG_2 0x2e
104+
#define ANIMZ_INSECT1_RG_3 0x2f
105+
#define ANIMZ_INSECT1_RG_4 0x30
106+
#define ANIMZ_INSECT1_RG_5 0x31
107+
#define ANIMZ_INSECT1_RG_6 0x32
108+
#define ANIMZ_INSECT1_RG_7 0x33
109+
#define ANIMZ_INSECT1_RG_8 0x34
110+
#define ANIMZ_LUTIN 0x35
111+
#define ANIMZ_LUTIN_2 0x36
112+
#define ANIMZ_LUTIN_3 0x37
113+
#define ANIMZ_LUTIN_4 0x38
114+
#define ANIMZ_LUTIN_5 0x39
115+
#define ANIMZ_LUTIN_6 0x3a
116+
#define ANIMZ_MANKA 0x3b
117+
#define ANIMZ_MANKA_2 0x3c
118+
#define ANIMZ_MANKA_3 0x3d
119+
#define ANIMZ_MANKA_4 0x3e
120+
#define ANIMZ_MANKA_5 0x3f
121+
#define ANIMZ_MANKA_6 0x40
122+
#define ANIMZ_OCTOPUS 0x41
123+
#define ANIMZ_OCTOPUS_2 0x42
124+
#define ANIMZ_OCTOPUS_3 0x43
125+
#define ANIMZ_OCTOPUS_4 0x44
126+
#define ANIMZ_OCTOPUS_5 0x45
127+
#define ANIMZ_OCTOPUS_6 0x46
128+
#define ANIMZ_OOO 0x47
129+
#define ANIMZ_OOO_2 0x48
130+
#define ANIMZ_TEDDY93 0x49
131+
#define ANIMZ_TEDDY93_2 0x4a
132+
#define ANIMZ_VAMPLANT 0x4b
133+
#define ANIMZ_VAMPLANT_2 0x4c
134+
#define ANIMZ_YAHOO 0x4d
135+
#define ANIMZ_YAHOO_2 0x4e
136+
#define ANIMZ_YIGA 0x4f
137+
#define ANIMZ_YIGA_2 0x50
138+
#define ANIMZ_YELKILLER 0x51
139+
#define ANIMZ_YELKILLER_2 0x52
140+
#define ANIMZ_ORB 0x53
141+
#define ANIMZ_ORB_2 0x54
142+
#define ANIMZ_ORB_3 0x55
143+
#define ANIMZ_ORB_4 0x56
144+
#define ANIMZ_TRIFORCE 0x57
145+
#define ANIMZ_TRIFORCE_2 0x58
146+
#define ANIMZ_TRIFORCE_3 0x59
147+
#define ANIMZ_TRIFORCE_4 0x5a
148+
#define ANIMZ_SPARKLE 0x5b
149+
#define ANIMZ_SPARKLE_2 0x5c
150+
#define ANIMZ_SPARKLE_3 0x5d
151+
#define ANIMZ_SPARKLE_4 0x5e
152+
#define ANIMZ_SPARKLE_5 0x5f
153+
#define ANIMZ_SPARKLE_6 0x60
154+
#define ANIMZ_SPARKLE_7 0x61
155+
#define ANIMZ_SPARKLE_8 0x62
156+
#define ANIMZ_MUSHROOM 0x63
157+
#define ANIMZ_MUSHROOM_2 0x64
158+
#define ANIMZ_MUSHROOM_3 0x65
159+
#define ANIMZ_MUSH_DOWN 0x66
160+
#define ANIMZ_MUSH_DOWN_2 0x67
161+
#define ANIMZ_MUSH_DOWN_3 0x68
162+
#define ANIMZ_MUSH_LEFT 0x69
163+
#define ANIMZ_MUSH_LEFT_2 0x6a
164+
#define ANIMZ_MUSH_LEFT_3 0x6b
165+
#define ANIMZ_MUSH_RIGHT 0x6c
166+
#define ANIMZ_MUSH_RIGHT_2 0x6d
167+
#define ANIMZ_MUSH_RIGHT_3 0x6e
168+
#define ANIMZ_WHTEWORM 0x6f
169+
#define ANIMZ_WHTEWORM_2 0x70
170+
#define ANIMZ_WHTEWORM_3 0x71
171+
#define ANIMZ_WHTEWORM_4 0x72
172+
#define ANIMZ_ETURTLE 0x73
173+
#define ANIMZ_ETURTLE_2 0x74
174+
#define ANIMZ_ETURTLE_3 0x75
175+
#define ANIMZ_ETURTLE_4 0x76
176+
#define ANIMZ_DRAGO 0x77
177+
#define ANIMZ_DRAGO_2 0x78
178+
#define ANIMZ_DRAGO_3 0x79
179+
#define ANIMZ_DRAGO_4 0x7a
180+
#define ANIMZ_EXPLOSION1 0x7b
181+
#define ANIMZ_EXPLOSION1_2 0x7c
182+
#define ANIMZ_EXPLOSION1_3 0x7d
183+
#define ANIMZ_EXPLOSION1_4 0x7e
184+
#define ANIMZ_EXPLOSION1_5 0x7f
185+
#define ANIMZ_DOORS_LEAF 0x80
186+
#define ANIMZ_DOORS_LEAF_2 0x81
187+
#define ANIMZ_FIREBALL 0x82
188+
#define ANIMZ_FIREBALL_2 0x83
189+
#define ANIMZ_FIREBALL_3 0x84
190+
#define ANIMZ_FIREBALL_4 0x85
191+
#define ANIMZ_EXPLOSION6 0x86
192+
#define ANIMZ_EXPLOSION6_2 0x87
193+
#define ANIMZ_EXPLOSION6_3 0x88
194+
#define ANIMZ_EXPLOSION6_4 0x89
195+
#define ANIMZ_EXPLOSION6_5 0x8a
196+
#define ANIMZ_EXPLOSION6_6 0x8b
197+
#define ANIMZ_TOTAL_COUNT 0x8c

‎src/data/animz.obl‎

1.21 KB
Binary file not shown.

‎src/data/bosses.obl‎

18.9 KB
Binary file not shown.

‎src/data/tiles.obl‎

3.42 KB
Binary file not shown.

‎src/data/uisheet.png‎

98 Bytes
Loading

‎src/dlgstat.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include <qstringlist.h>
77
#include "runtime/tilesdebug.h"
88
#include "runtime/attr.h"
9+
#include "runtime/tilesdefs.h"
910

1011
CDlgStat::CDlgStat(const uint8_t tileID, const uint8_t attr, QWidget *parent)
1112
: QDialog(parent)

0 commit comments

Comments
 (0)