Skip to content

Commit 2f2bf23

Browse files
committed
dont alloc memory for hidden entries
1 parent 1ea1fd7 commit 2f2bf23

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

src/game.c

-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ void game_introduction() {
9090
u8 *sample_ptr = NULL;
9191
u32 entry_size = hqr_get_hidden_entry_ptr(&sample_ptr, menu_samples, 0);
9292
sample_play_ptr(HQR_MENU_SAMPLES * 100 + sample_hidden_index, sample_ptr, entry_size, 22050, 0, 0);
93-
memory_free(sample_ptr);
9493
memory_free(menu_samples);
9594
}
9695

src/lib/hqr.c

+8-7
Original file line numberDiff line numberDiff line change
@@ -208,20 +208,21 @@ i32 hqr_get_hidden_entry_ptr(u8 **entry_ptr, u8 *hqr_ptr, i32 index) {
208208

209209
// not a valid hidden entry index
210210
if(index >= num_hidden_entries) {
211-
entry_ptr = NULL;
211+
// entry_ptr = NULL;
212212
return 0;
213213
}
214214

215215
ptr = hqr_ptr + index * 4;
216216
offset = *(u32*)ptr;
217217

218218
entry_size = *(u32*)(hqr_ptr + offset);
219-
*entry_ptr = (u8*)malloc(entry_size * sizeof(u8));
220-
if (!*entry_ptr) {
221-
printf("HQR WARNING: unable to allocate entry memory!!\n");
222-
return 0;
223-
}
224-
memcpy(*entry_ptr, hqr_ptr + offset + sizeof(hqr_hidden_entry_t), entry_size);
219+
// *entry_ptr = (u8*)malloc(entry_size * sizeof(u8));
220+
// if (!*entry_ptr) {
221+
// printf("HQR WARNING: unable to allocate entry memory!!\n");
222+
// return 0;
223+
// }
224+
// memcpy(*entry_ptr, hqr_ptr + offset + sizeof(hqr_hidden_entry_t), entry_size);
225+
*entry_ptr = hqr_ptr + offset + sizeof(hqr_hidden_entry_t);
225226

226227
return entry_size;
227228
}

src/lib/hqr.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ i32 hqr_get_num_entries(c8 *filename);
77

88
i32 hqr_get_entry(u8 * ptr, c8 *filename, i32 index);
99
i32 hqr_get_entry_size(c8 *filename, i32 index);
10-
i32 hqr_get_entry_alloc(u8 ** ptr, c8 *filename, i32 index);
10+
i32 hqr_get_entry_alloc(u8 **ptr, c8 *filename, i32 index);
1111
i32 hqr_get_hidden_entry_ptr(u8 **entry_ptr, u8 *hqr_ptr, i32 index);
1212

1313
#endif

0 commit comments

Comments
 (0)