Skip to content
Snippets Groups Projects
Commit fcc6e569 authored by Deucе's avatar Deucе :ok_hand_tone4:
Browse files

Since xp_play_sample() no longer takes a const buffer, we need to

cast all the const buffers before passing them in and rely on
runtime crashes to find bugs rather than compile-time errors.

Thanks Microsoft. :D
parent 862f4a2c
No related branches found
No related tags found
No related merge requests found
Pipeline #5747 passed
...@@ -2030,141 +2030,141 @@ incomingSoundVoc(unsigned char *codeStr) ...@@ -2030,141 +2030,141 @@ incomingSoundVoc(unsigned char *codeStr)
codeStr++; codeStr++;
switch (*codeStr) { switch (*codeStr) {
case '1': case '1':
xp_play_sample(ooii_snd_welcome, sizeof(ooii_snd_welcome), true); xp_play_sample((void*)ooii_snd_welcome, sizeof(ooii_snd_welcome), true);
break; break;
case '3': case '3':
xp_play_sample(ooii_snd_countdn, sizeof(ooii_snd_countdn), false); xp_play_sample((void*)ooii_snd_countdn, sizeof(ooii_snd_countdn), false);
/* Fallthrough */ /* Fallthrough */
case '2': case '2':
xp_play_sample(ooii_snd_explode, sizeof(ooii_snd_explode), true); xp_play_sample((void*)ooii_snd_explode, sizeof(ooii_snd_explode), true);
break; break;
case '4': case '4':
xp_play_sample(ooii_snd_clone, sizeof(ooii_snd_clone), true); xp_play_sample((void*)ooii_snd_clone, sizeof(ooii_snd_clone), true);
break; break;
case '5': case '5':
if (xp_random(2)) if (xp_random(2))
xp_play_sample(ooii_snd_danger1, sizeof(ooii_snd_danger1), true); xp_play_sample((void*)ooii_snd_danger1, sizeof(ooii_snd_danger1), true);
else else
xp_play_sample(ooii_snd_danger2, sizeof(ooii_snd_danger2), true); xp_play_sample((void*)ooii_snd_danger2, sizeof(ooii_snd_danger2), true);
break; break;
case '6': case '6':
xp_play_sample(ooii_snd_steam, sizeof(ooii_snd_steam), true); xp_play_sample((void*)ooii_snd_steam, sizeof(ooii_snd_steam), true);
break; break;
case '7': case '7':
xp_play_sample(ooii_snd_scream1, sizeof(ooii_snd_scream1), true); xp_play_sample((void*)ooii_snd_scream1, sizeof(ooii_snd_scream1), true);
break; break;
case '8': case '8':
xp_play_sample(ooii_snd_watch, sizeof(ooii_snd_watch), true); xp_play_sample((void*)ooii_snd_watch, sizeof(ooii_snd_watch), true);
break; break;
case '9': case '9':
xp_play_sample(ooii_snd_levelup, sizeof(ooii_snd_levelup), true); xp_play_sample((void*)ooii_snd_levelup, sizeof(ooii_snd_levelup), true);
break; break;
case 'A': case 'A':
xp_play_sample(ooii_snd_inflame, sizeof(ooii_snd_inflame), true); xp_play_sample((void*)ooii_snd_inflame, sizeof(ooii_snd_inflame), true);
break; break;
case 'B': case 'B':
switch (xp_random(3)) { switch (xp_random(3)) {
case 0: case 0:
xp_play_sample(ooii_snd_hit1, sizeof(ooii_snd_hit1), true); xp_play_sample((void*)ooii_snd_hit1, sizeof(ooii_snd_hit1), true);
break; break;
case 1: case 1:
xp_play_sample(ooii_snd_hit2, sizeof(ooii_snd_hit2), true); xp_play_sample((void*)ooii_snd_hit2, sizeof(ooii_snd_hit2), true);
break; break;
case 2: case 2:
xp_play_sample(ooii_snd_hit3, sizeof(ooii_snd_hit3), true); xp_play_sample((void*)ooii_snd_hit3, sizeof(ooii_snd_hit3), true);
break; break;
} }
break; break;
case 'C': case 'C':
xp_play_sample(ooii_snd_timeisup, sizeof(ooii_snd_timeisup), true); xp_play_sample((void*)ooii_snd_timeisup, sizeof(ooii_snd_timeisup), true);
break; break;
case 'D': case 'D':
xp_play_sample(ooii_snd_healing, sizeof(ooii_snd_healing), true); xp_play_sample((void*)ooii_snd_healing, sizeof(ooii_snd_healing), true);
break; break;
case 'E': case 'E':
xp_play_sample(ooii_snd_lrange2, sizeof(ooii_snd_lrange2), true); xp_play_sample((void*)ooii_snd_lrange2, sizeof(ooii_snd_lrange2), true);
break; break;
case 'F': case 'F':
xp_play_sample(ooii_snd_cackle, sizeof(ooii_snd_cackle), true); xp_play_sample((void*)ooii_snd_cackle, sizeof(ooii_snd_cackle), true);
break; break;
case 'G': case 'G':
xp_play_sample(ooii_snd_teleport, sizeof(ooii_snd_teleport), true); xp_play_sample((void*)ooii_snd_teleport, sizeof(ooii_snd_teleport), true);
break; break;
case 'H': case 'H':
xp_play_sample(ooii_snd_genetics, sizeof(ooii_snd_genetics), true); xp_play_sample((void*)ooii_snd_genetics, sizeof(ooii_snd_genetics), true);
break; break;
case 'I': case 'I':
xp_play_sample(ooii_snd_remote, sizeof(ooii_snd_remote), true); xp_play_sample((void*)ooii_snd_remote, sizeof(ooii_snd_remote), true);
break; break;
case 'J': case 'J':
xp_play_sample(ooii_snd_afbdoor, sizeof(ooii_snd_afbdoor), true); xp_play_sample((void*)ooii_snd_afbdoor, sizeof(ooii_snd_afbdoor), true);
break; break;
case 'K': case 'K':
xp_play_sample(ooii_snd_alarm, sizeof(ooii_snd_alarm), true); xp_play_sample((void*)ooii_snd_alarm, sizeof(ooii_snd_alarm), true);
break; break;
case 'L': case 'L':
xp_play_sample(ooii_snd_reverse, sizeof(ooii_snd_reverse), true); xp_play_sample((void*)ooii_snd_reverse, sizeof(ooii_snd_reverse), true);
break; break;
case 'M': case 'M':
xp_play_sample(ooii_snd_aerial, sizeof(ooii_snd_aerial), true); xp_play_sample((void*)ooii_snd_aerial, sizeof(ooii_snd_aerial), true);
break; break;
case 'N': case 'N':
xp_play_sample(ooii_snd_phaser, sizeof(ooii_snd_phaser), true); xp_play_sample((void*)ooii_snd_phaser, sizeof(ooii_snd_phaser), true);
break; break;
case 'O': case 'O':
switch (xp_random(3)) { switch (xp_random(3)) {
case 0: case 0:
xp_play_sample(ooii_snd_miss1, sizeof(ooii_snd_miss1), true); xp_play_sample((void*)ooii_snd_miss1, sizeof(ooii_snd_miss1), true);
break; break;
case 1: case 1:
xp_play_sample(ooii_snd_miss2, sizeof(ooii_snd_miss2), true); xp_play_sample((void*)ooii_snd_miss2, sizeof(ooii_snd_miss2), true);
break; break;
case 2: case 2:
xp_play_sample(ooii_snd_miss3, sizeof(ooii_snd_miss3), true); xp_play_sample((void*)ooii_snd_miss3, sizeof(ooii_snd_miss3), true);
break; break;
} }
break; break;
case 'P': case 'P':
if (xp_random(2)) if (xp_random(2))
xp_play_sample(ooii_snd_music1, sizeof(ooii_snd_music1), true); xp_play_sample((void*)ooii_snd_music1, sizeof(ooii_snd_music1), true);
else else
xp_play_sample(ooii_snd_music2, sizeof(ooii_snd_music2), true); xp_play_sample((void*)ooii_snd_music2, sizeof(ooii_snd_music2), true);
break; break;
case 'Q': case 'Q':
xp_play_sample(ooii_snd_device, sizeof(ooii_snd_device), true); xp_play_sample((void*)ooii_snd_device, sizeof(ooii_snd_device), true);
break; break;
case 'R': case 'R':
xp_play_sample(ooii_snd_death, sizeof(ooii_snd_death), true); xp_play_sample((void*)ooii_snd_death, sizeof(ooii_snd_death), true);
break; break;
case 'S': case 'S':
xp_play_sample(ooii_snd_good, sizeof(ooii_snd_good), true); xp_play_sample((void*)ooii_snd_good, sizeof(ooii_snd_good), true);
break; break;
case 'T': case 'T':
xp_play_sample(ooii_snd_yahoo, sizeof(ooii_snd_yahoo), true); xp_play_sample((void*)ooii_snd_yahoo, sizeof(ooii_snd_yahoo), true);
break; break;
case 'U': case 'U':
xp_play_sample(ooii_snd_scream2, sizeof(ooii_snd_scream2), true); xp_play_sample((void*)ooii_snd_scream2, sizeof(ooii_snd_scream2), true);
break; break;
case 'V': case 'V':
xp_play_sample(ooii_snd_wap, sizeof(ooii_snd_wap), true); xp_play_sample((void*)ooii_snd_wap, sizeof(ooii_snd_wap), true);
break; break;
case 'W': case 'W':
xp_play_sample(ooii_snd_zip, sizeof(ooii_snd_zip), true); xp_play_sample((void*)ooii_snd_zip, sizeof(ooii_snd_zip), true);
break; break;
case 'X': case 'X':
xp_play_sample(ooii_snd_lrange3, sizeof(ooii_snd_lrange3), true); xp_play_sample((void*)ooii_snd_lrange3, sizeof(ooii_snd_lrange3), true);
break; break;
case 'Y': case 'Y':
xp_play_sample(ooii_snd_snip, sizeof(ooii_snd_snip), true); xp_play_sample((void*)ooii_snd_snip, sizeof(ooii_snd_snip), true);
break; break;
case 'Z': case 'Z':
xp_play_sample(ooii_snd_pow, sizeof(ooii_snd_pow), true); xp_play_sample((void*)ooii_snd_pow, sizeof(ooii_snd_pow), true);
break; break;
default: default:
/* /*
* LRANGE1 is unused * LRANGE1 is unused
* xp_play_sample(ooii_snd_lrange1, sizeof(ooii_snd_lrange1), true); * xp_play_sample((void*)ooii_snd_lrange1, sizeof(ooii_snd_lrange1), true);
*/ */
break; break;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment