Skip to content

Commit 8240fb1

Browse files
committed
Cleaning HUD-related code
1 parent 1920e77 commit 8240fb1

Some content is hidden

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

50 files changed

+800
-775
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@ add_executable(spelunkyds
5050
source/collisions/collisions.cpp
5151
source/collisions/collisions.h
5252
source/hud/hud.cpp source/hud/hud.h
53-
source/sprites/sprite_info.cpp source/sprites/sprite_info.h source/camera/camera.cpp source/camera/camera.h source/memory/oam_manager.cpp source/memory/oam_manager.h source/input/input_handler.cpp source/input/input_handler.h source/sprites/spritesheet_type.hpp source/memory/oam_type.hpp source/sprites/items/rock.h source/sprites/items/jar.cpp source/sprites/items/jar.h source/sprites/enemies/snake.cpp source/sprites/enemies/snake.h source/sprites/collectibles/moniez.cpp source/sprites/collectibles/moniez.h source/tiles/map_tile_type.hpp source/sprites/animations/blood.cpp source/sprites/animations/blood.h source/sprites/animations/blood_element.cpp source/sprites/animations/blood_element.h source/sprites/non_interactive/spelunky_title.cpp source/sprites/non_interactive/spelunky_title.h source/tiles/tile_orientation.hpp source/sprites/non_interactive/title_menu_sign.cpp source/sprites/non_interactive/title_menu_sign.h source/sprites/menu_sign_type.hpp source/tiles/splash_screen_type.hpp source/rooms/left_right_rooms.hpp source/rooms/left_right_down_rooms.hpp source/rooms/left_right_up_rooms.hpp source/rooms/closed_rooms.hpp source/rooms/splash_screens.hpp source/rooms/entrance_rooms.hpp source/rooms/exit_rooms.hpp source/rooms/room_type.hpp source/sprites/enemies/bat.cpp source/sprites/enemies/bat.h source/sprites/enemies/spider.cpp source/sprites/enemies/spider.h source/sprites/sprite_type.hpp source/globals_definitions.h source/sound/sound_utils.h source/console/console_utils.h source/time/time_utils.h source/time/time_utils.cpp source/memory/oam_utils.cpp source/memory/oam_utils.h source/sprites/main_dude/whip.cpp source/sprites/main_dude/whip.h source/sprites/traps/spikes.cpp source/sprites/traps/spikes.h source/sprites/collectibles/chest.cpp source/sprites/collectibles/chest.h source/sprites/collectibles/crate.h source/sprites/collectibles/crate.cpp source/sprites/collectibles/shotgun.h source/sprites/collectibles/shotgun.cpp source/sprites/collectibles/bullet.h source/sprites/collectibles/bullet.cpp source/sprites/collectibles/pistol.h source/sprites/collectibles/pistol.cpp source/sprites/collectibles/spring_shoes.h source/sprites/collectibles/spring_shoes.cpp source/sprites/collectibles/mitt.h source/sprites/collectibles/mitt.cpp source/sprites/collectibles/glove.h source/sprites/collectibles/glove.cpp source/sprites/collectibles/compass.h source/sprites/collectibles/compass.cpp source/sprites/animations/got_collectible.h source/sprites/animations/got_collectible.cpp source/camera/layer_level.hpp source/sprites/enemies/shopkeeper.h source/sprites/enemies/shopkeeper.cpp source/sprites/main_dude/dude_utils.cpp source/sprites/main_dude/game_state.h source/sprites/main_dude/game_state.cpp source/sprites/enemies/caveman.h source/sprites/enemies/caveman.cpp source/sprites/animations/fall_poof.h source/sprites/animations/fall_poof.cpp source/sprites/items/cape.h source/sprites/items/cape.cpp source/sprites/items/spike_shoes.h source/sprites/items/spike_shoes.cpp source/sprites/items/pick.hpp source/sprites/items/pick.cpp source/sprites/items/jetpack.h source/sprites/items/jetpack.cpp source/sprites/items/parachute.hpp source/sprites/items/parachute.cpp source/sprites/items/rope_pile.hpp source/sprites/items/rope_pile.cpp source/sprites/items/bomb_bag.hpp source/sprites/items/bomb_bag.cpp source/sprites/items/bomb_box.hpp source/sprites/items/bomb_box.cpp source/sprites/animations/flame.h source/sprites/animations/flame_element.cpp source/sprites/animations/flame.cpp source/sprites/animations/flame_element.h source/sprites/enemies/damsel.h source/sprites/enemies/damsel.cpp source/sprites/animations/smooch.h source/sprites/animations/smooch.cpp source/rooms/shops.hpp source/sprites/non_interactive/lamp.h source/sprites/non_interactive/lamp.cpp source/tiles/direction.hpp source/sprites/collectibles/collectibles_utils.h source/sprites/collectibles/collectibles_utils.cpp source/sprites/shopping_object.h source/sprites/non_interactive/shopping_icon.h source/sprites/non_interactive/shopping_icon.cpp source/sprites/shopping_object.cpp source/sprites/traps/arrow_trap.h source/sprites/traps/arrow_trap.cpp source/sprites/animations/blast.h source/sprites/animations/blast.cpp source/rooms/snake_well.hpp source/sprites/enemies/skeleton.cpp source/sprites/enemies/skeleton.h source/sound/sound_utils.cpp source/sprites/animations/bone.h source/sprites/animations/bone.cpp source/sprites/animations/skull.h source/sprites/animations/skull.cpp source/sprites/animations/fake_skeleton.h source/sprites/animations/fake_skeleton.cpp)
53+
source/sprites/sprite_info.cpp source/sprites/sprite_info.h source/camera/camera.cpp source/camera/camera.h source/memory/oam_manager.cpp source/memory/oam_manager.h source/input/input_handler.cpp source/input/input_handler.h source/sprites/spritesheet_type.hpp source/memory/oam_type.hpp source/sprites/items/rock.h source/sprites/items/jar.cpp source/sprites/items/jar.h source/sprites/enemies/snake.cpp source/sprites/enemies/snake.h source/sprites/collectibles/moniez.cpp source/sprites/collectibles/moniez.h source/tiles/map_tile_type.hpp source/sprites/animations/blood.cpp source/sprites/animations/blood.h source/sprites/animations/blood_element.cpp source/sprites/animations/blood_element.h source/sprites/non_interactive/spelunky_title.cpp source/sprites/non_interactive/spelunky_title.h source/tiles/tile_orientation.hpp source/sprites/non_interactive/title_menu_sign.cpp source/sprites/non_interactive/title_menu_sign.h source/sprites/menu_sign_type.hpp source/tiles/splash_screen_type.hpp source/rooms/left_right_rooms.hpp source/rooms/left_right_down_rooms.hpp source/rooms/left_right_up_rooms.hpp source/rooms/closed_rooms.hpp source/rooms/splash_screens.hpp source/rooms/entrance_rooms.hpp source/rooms/exit_rooms.hpp source/rooms/room_type.hpp source/sprites/enemies/bat.cpp source/sprites/enemies/bat.h source/sprites/enemies/spider.cpp source/sprites/enemies/spider.h source/sprites/sprite_type.hpp source/globals_definitions.h source/sound/sound_utils.h source/console/console_utils.h source/time/time_utils.h source/time/time_utils.cpp source/memory/oam_utils.cpp source/memory/oam_utils.h source/sprites/main_dude/whip.cpp source/sprites/main_dude/whip.h source/sprites/traps/spikes.cpp source/sprites/traps/spikes.h source/sprites/collectibles/chest.cpp source/sprites/collectibles/chest.h source/sprites/collectibles/crate.h source/sprites/collectibles/crate.cpp source/sprites/collectibles/shotgun.h source/sprites/collectibles/shotgun.cpp source/sprites/collectibles/bullet.h source/sprites/collectibles/bullet.cpp source/sprites/collectibles/pistol.h source/sprites/collectibles/pistol.cpp source/sprites/collectibles/spring_shoes.h source/sprites/collectibles/spring_shoes.cpp source/sprites/collectibles/mitt.h source/sprites/collectibles/mitt.cpp source/sprites/collectibles/glove.h source/sprites/collectibles/glove.cpp source/sprites/collectibles/compass.h source/sprites/collectibles/compass.cpp source/sprites/animations/got_collectible.h source/sprites/animations/got_collectible.cpp source/camera/layer_level.hpp source/sprites/enemies/shopkeeper.h source/sprites/enemies/shopkeeper.cpp source/sprites/main_dude/dude_utils.cpp source/sprites/main_dude/game_state.h source/sprites/main_dude/game_state.cpp source/sprites/enemies/caveman.h source/sprites/enemies/caveman.cpp source/sprites/animations/fall_poof.h source/sprites/animations/fall_poof.cpp source/sprites/items/cape.h source/sprites/items/cape.cpp source/sprites/items/spike_shoes.h source/sprites/items/spike_shoes.cpp source/sprites/items/pick.hpp source/sprites/items/pick.cpp source/sprites/items/jetpack.h source/sprites/items/jetpack.cpp source/sprites/items/parachute.hpp source/sprites/items/parachute.cpp source/sprites/items/rope_pile.hpp source/sprites/items/rope_pile.cpp source/sprites/items/bomb_bag.hpp source/sprites/items/bomb_bag.cpp source/sprites/items/bomb_box.hpp source/sprites/items/bomb_box.cpp source/sprites/animations/flame.h source/sprites/animations/flame_element.cpp source/sprites/animations/flame.cpp source/sprites/animations/flame_element.h source/sprites/enemies/damsel.h source/sprites/enemies/damsel.cpp source/sprites/animations/smooch.h source/sprites/animations/smooch.cpp source/rooms/shops.hpp source/sprites/non_interactive/lamp.h source/sprites/non_interactive/lamp.cpp source/tiles/direction.hpp source/sprites/collectibles/collectibles_utils.h source/sprites/collectibles/collectibles_utils.cpp source/sprites/shopping_object.h source/sprites/non_interactive/shopping_icon.h source/sprites/non_interactive/shopping_icon.cpp source/sprites/shopping_object.cpp source/sprites/traps/arrow_trap.h source/sprites/traps/arrow_trap.cpp source/sprites/animations/blast.h source/sprites/animations/blast.cpp source/rooms/snake_well.hpp source/sprites/enemies/skeleton.cpp source/sprites/enemies/skeleton.h source/sound/sound_utils.cpp source/sprites/animations/bone.h source/sprites/animations/bone.cpp source/sprites/animations/skull.h source/sprites/animations/skull.cpp source/sprites/animations/fake_skeleton.h source/sprites/animations/fake_skeleton.cpp source/global_definitions.cpp source/base_map.h)

gfx/sprites/16x16/gfx_goldbars.png

100755100644
280 Bytes
Loading

gfx/sprites/16x16/gfx_spider_skeleton.png

100644100755
File mode changed.

notes/notes.txt

Lines changed: 148 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,151 @@ Quite easy to overflow that number.
1616

1717
Game mechanics:
1818
- Ladders are not destructable, neither are ropes.
19-
- Rope is up to 8 tiles height (8 x 16px)
19+
- Rope is up to 8 tiles height (8 x 16px)
20+
21+
22+
**** SNIPPETS
23+
24+
> Streaming music from filesystem
25+
26+
/*
27+
28+
29+
bool done = false;
30+
FILE *pFile;
31+
32+
//---------------------------------------------------------------------------------
33+
void dirlist(const char *path) {
34+
//---------------------------------------------------------------------------------
35+
36+
DIR *pdir = opendir(path);
37+
38+
if (pdir != NULL) {
39+
40+
while (true) {
41+
struct dirent *pent = readdir(pdir);
42+
if (pent == NULL) break;
43+
44+
if (strcmp(".", pent->d_name) != 0 && strcmp("..", pent->d_name) != 0) {
45+
if (pent->d_type == DT_DIR) {
46+
printf("%s/%s <DIR>\n", (strcmp("/", path) == 0) ? "" : path, pent->d_name);
47+
char *dnbuf = (char *) malloc(strlen(pent->d_name) + strlen(path) + 2);
48+
sprintf(dnbuf, "%s/%s", (strcmp("/", path) == 0) ? "" : path, pent->d_name);
49+
dirlist(dnbuf);
50+
free(dnbuf);
51+
} else {
52+
printf("%s/%s\n", (strcmp("/", path) == 0) ? "" : path, pent->d_name);
53+
}
54+
}
55+
}
56+
57+
closedir(pdir);
58+
} else {
59+
printf("OPENDIR() FAILIURE.\n");
60+
}
61+
}
62+
63+
64+
mm_word stream(mm_word length, mm_addr dest, mm_stream_formats format) {
65+
size_t samplesize;
66+
switch (format) {
67+
case MM_STREAM_8BIT_MONO:
68+
samplesize = 1;
69+
break;
70+
case MM_STREAM_8BIT_STEREO:
71+
samplesize = 2;
72+
break;
73+
case MM_STREAM_16BIT_MONO:
74+
samplesize = 2;
75+
break;
76+
case MM_STREAM_16BIT_STEREO:
77+
samplesize = 4;
78+
break;
79+
}
80+
81+
int res = fread(dest, samplesize, length, pFile);
82+
83+
if (res) {
84+
length = res;
85+
std::cout << length << '\n';
86+
} else {
87+
//End of file
88+
std::cout << "END OF FILE" << '\n';
89+
length = 0;
90+
done = true;
91+
}
92+
93+
return length; //Return the number of samples read
94+
}
95+
96+
*/
97+
/*
98+
if (nitroFSInit(NULL)) {
99+
100+
dirlist("/");
101+
102+
{
103+
// now, try reading a file to make sure things are working OK.
104+
FILE *inf = fopen("file1.txt", "rb");
105+
if (inf) {
106+
int len;
107+
108+
fseek(inf, 0, SEEK_END);
109+
len = ftell(inf);
110+
fseek(inf, 0, SEEK_SET);
111+
112+
printf("\nTHE FOLLOWING %d BYTES MESSAGE\nfrom file1.txt is\nbrought to you by fread:\n", len);
113+
{
114+
char *entireFile = (char *) malloc(len + 1);
115+
entireFile[len] = 0;
116+
if (fread(entireFile, 1, len, inf) != len)
117+
printf("SAVAGE ERROR READING BYTES FROM THE FILE!\n");
118+
else
119+
printf("%s\n-DONE-\n", entireFile);
120+
free(entireFile);
121+
}
122+
123+
fclose(inf);
124+
}
125+
}
126+
127+
printf("HERE IS THE DIRLIST ONCE MORE:\n");
128+
dirlist("/");
129+
130+
} else {
131+
printf("NITROFSINIT FAILIURE: TERMINATIONG\n");
132+
}*/
133+
134+
/*
135+
136+
timerStart(0, ClockDivider_1024, 1000, 0);
137+
138+
mm_stream mystream;
139+
mystream.buffer_length = 1024; //16kb
140+
mystream.callback = stream;
141+
mystream.timer = MM_TIMER1;
142+
mystream.manual = false;
143+
mystream.sampling_rate = 16000;
144+
mystream.format = MM_STREAM_8BIT_MONO;
145+
146+
pFile = fopen("xpause.raw", "rb");
147+
148+
mmStreamOpen(&mystream);
149+
150+
int timer = 0;
151+
152+
while (1) {
153+
// mmStreamUpdate();
154+
swiWaitForVBlank();
155+
if (done) {
156+
mmStreamClose();
157+
fclose(pFile);
158+
}
159+
// timer += (timerElapsed(0) / TICKS_PER_SECOND);
160+
// if(timer > 100 * 1000) {
161+
// timer = 0;
162+
//
163+
// }
164+
165+
}
166+
*/

0 commit comments

Comments
 (0)