diff --git a/src/NpcAct020.cpp b/src/NpcAct020.cpp index 09d9d06a..83c7a49c 100644 --- a/src/NpcAct020.cpp +++ b/src/NpcAct020.cpp @@ -197,7 +197,7 @@ void ActNpc024(NPCHAR *npc) npc->act_no = 4; npc->ani_no = 3; npc->act_wait = 0; - npc->act_wait = 0; + npc->act_wait = 0; // lol duplicate line } break; @@ -487,7 +487,7 @@ void ActNpc028(NPCHAR *npc) npc->direct = 2; if (npc->direct == 0) - npc->xm = -0x100u; + npc->xm = -0x100; else npc->xm = 0x100; } @@ -501,7 +501,7 @@ void ActNpc028(NPCHAR *npc) npc->act_no = 4; npc->ani_no = 3; npc->act_wait = 0; - npc->act_wait = 0; + npc->act_wait = 0; // lol duplicate line } break; diff --git a/src/Sound.h b/src/Sound.h index 3c02e75f..2e78292c 100644 --- a/src/Sound.h +++ b/src/Sound.h @@ -20,7 +20,7 @@ class SOUNDBUFFER void Play(bool bLooping); void Stop(); - void Mix(float *buffer, int len); + void Mix(float (*buffer)[2], size_t samples); SOUNDBUFFER *next;