From d1712ab7b40df1592ab6c0882c5bc53ca1af844f Mon Sep 17 00:00:00 2001 From: kichikuou Date: Fri, 2 Sep 2022 19:29:23 +0900 Subject: [PATCH] Remove newline character from debug print macro calls Now "\n" is appended by the macros. --- modules/AliceLogo/AliceLogo.c | 6 +- modules/Confirm/Confirm.c | 8 +- modules/Gpx/Gpx.c | 108 ++++----- modules/Gpx/effectcopy.c | 2 +- modules/Math/Math.c | 8 +- modules/MsgSkip/MsgSkip.c | 16 +- modules/NIGHTDLL/NIGHTDLL.c | 136 +++++------ modules/NIGHTDLL/nt_msg.c | 6 +- modules/NIGHTDLL/nt_scenario.c | 6 +- modules/NIGHTDLL/sactcg.c | 6 +- modules/NIGHTDLL/sprite_draw.c | 4 +- modules/NIGHTDLL/sprite_eupdate.c | 2 +- modules/NIGHTDLL/sprite_update.c | 8 +- modules/NightDemonDemo/NightDemonDemo.c | 6 +- modules/RandMT/RandMT.c | 6 +- modules/SACT/SACT.c | 254 ++++++++++----------- modules/SACT/sactcg.c | 6 +- modules/SACT/sactcrypto.c | 10 +- modules/SACT/sactsound.c | 2 +- modules/SACT/sprite.c | 8 +- modules/SACT/sprite_anime.c | 2 +- modules/SACT/sprite_draw.c | 2 +- modules/SACT/sprite_eupdate.c | 2 +- modules/SACT/sprite_event.c | 8 +- modules/SACT/sprite_move.c | 4 +- modules/SACT/sprite_msg.c | 4 +- modules/SACT/sprite_update.c | 6 +- modules/ShArray/ShArray.c | 108 ++++----- modules/ShCalc/ShCalc.c | 46 ++-- modules/ShGraph/ShGraph.c | 24 +- modules/ShPort/ShPort.c | 24 +- modules/ShSound/ShSound.c | 32 +-- modules/ShString/ShString.c | 20 +- modules/dDemo/dDemo.c | 8 +- modules/eDemo/eDemo.c | 10 +- modules/eeDemo/eeDemo.c | 8 +- modules/lib/alk.c | 2 +- modules/lib/cg.c | 2 +- modules/lib/graph.c | 38 ++-- modules/lib/graph_blend_amap.c | 2 +- modules/lib/graph_copy_amap.c | 4 +- modules/lib/graph_saturadd_amap.c | 4 +- modules/lib/surface.c | 2 +- modules/modules.c | 4 +- modules/nDEMO/nDEMO.c | 8 +- modules/nDEMOE/nDEMOE.c | 6 +- modules/oDEMO/oDEMO.c | 8 +- modules/oujimisc/oujimisc.c | 52 ++--- modules/tDemo/tDemo.c | 8 +- src/ags.c | 8 +- src/bgi.c | 2 +- src/bgm.sdlmixer.c | 4 +- src/cali.c | 6 +- src/cdrom.c | 2 +- src/cdrom.mp3.c | 6 +- src/cg.c | 6 +- src/cmd2F.c | 286 ++++++++++++------------ src/cmd_check.c | 8 +- src/cmdb.c | 36 +-- src/cmdc.c | 42 ++-- src/cmdd.c | 18 +- src/cmde.c | 10 +- src/cmdf.c | 22 +- src/cmdg.c | 16 +- src/cmdh.c | 4 +- src/cmdi.c | 18 +- src/cmdj.c | 10 +- src/cmdk.c | 14 +- src/cmdl.c | 46 ++-- src/cmdm.c | 38 ++-- src/cmdn.c | 62 ++--- src/cmdp.c | 22 +- src/cmdq.c | 12 +- src/cmds.c | 52 ++--- src/cmdt.c | 2 +- src/cmdu.c | 18 +- src/cmdv.c | 86 +++---- src/cmdw.c | 8 +- src/cmdy.c | 4 +- src/cmdz.c | 82 +++---- src/cursor.c | 50 ++--- src/debug_symbol.c | 18 +- src/ecopy.c | 4 +- src/font.c | 6 +- src/jpeg.c | 2 +- src/midi.portmidi.c | 72 +++--- src/midi.rawmidi.c | 14 +- src/midifile.c | 52 ++--- src/mmap.c | 14 +- src/pcm.sdlmixer.c | 6 +- src/qnt.c | 4 +- src/s39ain.c | 6 +- src/s39init.c | 4 +- src/savedata.c | 20 +- src/scenario.c | 14 +- src/scenario.h | 4 +- src/sdl_cursor.c | 2 +- src/sdl_draw.c | 2 +- src/sdl_effect.c | 4 +- src/sdl_event.c | 2 +- src/sdl_video.c | 4 +- src/system.h | 7 +- src/variable.c | 16 +- src/webp.c | 6 +- 104 files changed, 1170 insertions(+), 1169 deletions(-) diff --git a/modules/AliceLogo/AliceLogo.c b/modules/AliceLogo/AliceLogo.c index 320e3c9..a6e9e9e 100644 --- a/modules/AliceLogo/AliceLogo.c +++ b/modules/AliceLogo/AliceLogo.c @@ -16,21 +16,21 @@ static void Init() { *var = 1; - DEBUG_COMMAND_YET("AliceLogo.Init %d,%d,%d,%p:\n", p1, p2, p3, var); + DEBUG_COMMAND_YET("AliceLogo.Init %d,%d,%d,%p:", p1, p2, p3, var); } static void SetWaveNum() { int p1 = getCaliValue(); int p2 = getCaliValue(); - DEBUG_COMMAND_YET("AliceLogo.SetWaveNum %d,%d:\n", p1, p2); + DEBUG_COMMAND_YET("AliceLogo.SetWaveNum %d,%d:", p1, p2); } static void Run() { int p1 = getCaliValue(); int p2 = getCaliValue(); - DEBUG_COMMAND_YET("AliceLogo.Run %d,%d:\n", p1, p2); + DEBUG_COMMAND_YET("AliceLogo.Run %d,%d:", p1, p2); } static const ModuleFunc functions[] = { diff --git a/modules/Confirm/Confirm.c b/modules/Confirm/Confirm.c index a3be67d..f1aea47 100644 --- a/modules/Confirm/Confirm.c +++ b/modules/Confirm/Confirm.c @@ -10,7 +10,7 @@ static void Init() { int p1 = getCaliValue(); - DEBUG_COMMAND_YET("Confirm.Init %d:\n", p1); + DEBUG_COMMAND_YET("Confirm.Init %d:", p1); } static void ExistKeyFile() { @@ -20,7 +20,7 @@ static void ExistKeyFile() { *var = 1; - DEBUG_COMMAND_YET("Confirm.ExistKeyFile %s,%p,%p:\n",p1, p2, var); + DEBUG_COMMAND_YET("Confirm.ExistKeyFile %s,%p,%p:",p1, p2, var); } static void CheckProtectFile() { @@ -30,7 +30,7 @@ static void CheckProtectFile() { *var = 1; - DEBUG_COMMAND_YET("Confirm.CheckProtectFile %s,%p,%p:\n", p1,p2,var); + DEBUG_COMMAND_YET("Confirm.CheckProtectFile %s,%p,%p:", p1,p2,var); } static void CreateKeyFile() { @@ -40,7 +40,7 @@ static void CreateKeyFile() { *var = 1; - DEBUG_COMMAND_YET("Confirm.CreateKeyFile %s,%p,%p:\n", p1,p2,var); + DEBUG_COMMAND_YET("Confirm.CreateKeyFile %s,%p,%p:", p1,p2,var); } static const ModuleFunc functions[] = { diff --git a/modules/Gpx/Gpx.c b/modules/Gpx/Gpx.c index aef205c..25f9a78 100644 --- a/modules/Gpx/Gpx.c +++ b/modules/Gpx/Gpx.c @@ -113,7 +113,7 @@ static int load_cg_main(int no) { int sno; if (sf == NULL) { - WARNING("load fail(cg==NULL,no=%d)\n", no); + WARNING("load fail(cg==NULL,no=%d)", no); return 0; } @@ -136,7 +136,7 @@ static void Init() { // surface0 を pre_freesurfno として返さないように。 pre_freesurfno = 1; - DEBUG_COMMAND("Gpx.Init %d:\n", p1); + DEBUG_COMMAND("Gpx.Init %d:", p1); } static void Gpx_reset(void) { @@ -171,7 +171,7 @@ static void Create() { suf[no] = s; } - DEBUG_COMMAND("Gpx.Create %p,%d,%d,%d:\n", var, width, height, bpp); + DEBUG_COMMAND("Gpx.Create %p,%d,%d,%d:", var, width, height, bpp); } static void CreatePixelOnly() { @@ -199,7 +199,7 @@ static void CreatePixelOnly() { suf[no] = s; } - DEBUG_COMMAND("Gpx.CreatePixelOnly %d,%d,%d,%d:\n", *var, width, height, bpp); + DEBUG_COMMAND("Gpx.CreatePixelOnly %d,%d,%d,%d:", *var, width, height, bpp); } static void CreateAMapOnly() { @@ -225,7 +225,7 @@ static void CreateAMapOnly() { suf[no] = s; } - DEBUG_COMMAND("Gpx.CreateAMapOnly %p,%d,%d:\n", var, width, height); + DEBUG_COMMAND("Gpx.CreateAMapOnly %p,%d,%d:", var, width, height); } static void IsSurface() { @@ -248,7 +248,7 @@ static void IsSurface() { *var = (s->alpha && s->pixel) ? 1 : 0; } - DEBUG_COMMAND("Gpx.IsSurface %d,%p:\n", p1, var); + DEBUG_COMMAND("Gpx.IsSurface %d,%p:", p1, var); } static void IsPixel() { @@ -270,7 +270,7 @@ static void IsPixel() { *var = s->pixel ? 1 : 0; } - DEBUG_COMMAND("Gpx.IsPixel %d,%p:\n", p1, var); + DEBUG_COMMAND("Gpx.IsPixel %d,%p:", p1, var); } static void IsAlpha() { @@ -292,7 +292,7 @@ static void IsAlpha() { *var = s->alpha ? 1 : 0; } - DEBUG_COMMAND("Gpx.IsAlpha %d,%p:\n", p1, var); + DEBUG_COMMAND("Gpx.IsAlpha %d,%p:", p1, var); } static void GetWidth() { @@ -314,7 +314,7 @@ static void GetWidth() { *var = s->width; } - DEBUG_COMMAND("Gpx.GetWidth %d,%d:\n", p1, *var); + DEBUG_COMMAND("Gpx.GetWidth %d,%d:", p1, *var); } static void GetHeight() { @@ -336,13 +336,13 @@ static void GetHeight() { *var = s->height; } - DEBUG_COMMAND("Gpx.GetHeight %d,%d:\n", p1, *var); + DEBUG_COMMAND("Gpx.GetHeight %d,%d:", p1, *var); } static void GetCreatedSurface() { /* not used ? */ int *var = getCaliVariable(); - DEBUG_COMMAND_YET("Gpx.GetCreatedSurface %p:\n", var); + DEBUG_COMMAND_YET("Gpx.GetCreatedSurface %p:", var); } static void LoadCG() { @@ -357,21 +357,21 @@ static void LoadCG() { *var = load_cg_main(p1 -1); - DEBUG_COMMAND("Gpx.LoadCG %p,%d (%d):\n", var, p1, *var); + DEBUG_COMMAND("Gpx.LoadCG %p,%d (%d):", var, p1, *var); } static void GetCGPosX() { /* not useed ? */ int *var = getCaliVariable(); int p1 = getCaliValue(); - DEBUG_COMMAND_YET("Gpx.GetCgPosX %p,%d:\n", var, p1); + DEBUG_COMMAND_YET("Gpx.GetCgPosX %p,%d:", var, p1); } static void GetCGPosY() { /* not useed ? */ int *var = getCaliVariable(); int p1 = getCaliValue(); - DEBUG_COMMAND_YET("Gpx.GetCgPosY %p,%d:\n", var, p1); + DEBUG_COMMAND_YET("Gpx.GetCgPosY %p,%d:", var, p1); } static void Free() { @@ -382,7 +382,7 @@ static void Free() { */ int p1 = getCaliValue(); - DEBUG_COMMAND("Gpx.Free %d:\n", p1); + DEBUG_COMMAND("Gpx.Free %d:", p1); if (p1 != 0) { sf_free_one(p1); @@ -395,7 +395,7 @@ static void FreeAll() { */ sf_free_all(); - DEBUG_COMMAND("Gpx.FreeAll:\n"); + DEBUG_COMMAND("Gpx.FreeAll:"); } static void Copy() { @@ -421,7 +421,7 @@ static void Copy() { int sh = getCaliValue(); surface_t *src, *dst; - DEBUG_COMMAND("Gpx.Copy %d,%d,%d,%d,%d,%d,%d,%d:\n", ds, dx, dy, ss, sx, sy, sw, sh); + DEBUG_COMMAND("Gpx.Copy %d,%d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, ss, sx, sy, sw, sh); src = sf_get(ss); dst = sf_get(ds); @@ -439,7 +439,7 @@ static void CopyBright() { /* not used ? */ int p8 = getCaliValue(); int p9 = getCaliValue(); - DEBUG_COMMAND_YET("Gpx.CopyBright %d,%d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8, p9); + DEBUG_COMMAND_YET("Gpx.CopyBright %d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9); } static void CopyAMap() { @@ -465,7 +465,7 @@ static void CopyAMap() { int sh = getCaliValue(); surface_t *src, *dst; - DEBUG_COMMAND("Gpx.CopyAMap %d,%d,%d,%d,%d,%d,%d,%d:\n", da, dx, dy, sa, sx, sy, sw, sh); + DEBUG_COMMAND("Gpx.CopyAMap %d,%d,%d,%d,%d,%d,%d,%d:", da, dx, dy, sa, sx, sy, sw, sh); src = sf_get(sa); dst = sf_get(da); @@ -483,7 +483,7 @@ static void Blend() { /* not used ? */ int p8 = getCaliValue(); int p9 = getCaliValue(); - DEBUG_COMMAND_YET("Gpx.Blend %d,%d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8, p9); + DEBUG_COMMAND_YET("Gpx.Blend %d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9); } static void BlendSrcBright() { /* not used ? */ @@ -498,7 +498,7 @@ static void BlendSrcBright() { /* not used ? */ int p9 = getCaliValue(); int p10 = getCaliValue(); - DEBUG_COMMAND_YET("Gpx.BlendSrcBright %d,%d,%d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10); + DEBUG_COMMAND_YET("Gpx.BlendSrcBright %d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10); } static void BlendAddSatur() { /* not used ? */ @@ -511,7 +511,7 @@ static void BlendAddSatur() { /* not used ? */ int p7 = getCaliValue(); int p8 = getCaliValue(); - DEBUG_COMMAND_YET("Gpx.BlendAddStatur %d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8); + DEBUG_COMMAND_YET("Gpx.BlendAddStatur %d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8); } static void BlendAMap() { @@ -537,7 +537,7 @@ static void BlendAMap() { int sh = getCaliValue(); surface_t *src, *dst; - DEBUG_COMMAND("Gpx.BlendAMap %d,%d,%d,%d,%d,%d,%d,%d:\n", ds, dx, dy, ss, sx, sy, sw, sh); + DEBUG_COMMAND("Gpx.BlendAMap %d,%d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, ss, sx, sy, sw, sh); src = sf_get(ss); dst = sf_get(ds); @@ -554,7 +554,7 @@ static void BlendAMapSrcOnly() { /* not used ? */ int p7 = getCaliValue(); int p8 = getCaliValue(); - DEBUG_COMMAND_YET("Gpx.BlendAMapSrcOnly %d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8); + DEBUG_COMMAND_YET("Gpx.BlendAMapSrcOnly %d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8); } static void BlendAMapColor() { /* not used ? */ @@ -570,7 +570,7 @@ static void BlendAMapColor() { /* not used ? */ int p10 = getCaliValue(); int p11 = getCaliValue(); - DEBUG_COMMAND_YET("Gpx.BlendAMapColor %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11); + DEBUG_COMMAND_YET("Gpx.BlendAMapColor %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11); } static void BlendAMapColorAlpha() { /* not used ? */ @@ -587,7 +587,7 @@ static void BlendAMapColorAlpha() { /* not used ? */ int p11 = getCaliValue(); int p12 = getCaliValue(); - DEBUG_COMMAND_YET("Gpx.BlendAMapColorAlpha %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12); + DEBUG_COMMAND_YET("Gpx.BlendAMapColorAlpha %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12); } static void BlendAMapAlpha() { /* not used ? */ @@ -601,7 +601,7 @@ static void BlendAMapAlpha() { /* not used ? */ int p8 = getCaliValue(); int p9 = getCaliValue(); - DEBUG_COMMAND_YET("Gpx.BlendAMapAlpha %d,%d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8, p9); + DEBUG_COMMAND_YET("Gpx.BlendAMapAlpha %d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9); } static void BlendAMapBright() { /* not used ? */ @@ -615,7 +615,7 @@ static void BlendAMapBright() { /* not used ? */ int p8 = getCaliValue(); int p9 = getCaliValue(); - DEBUG_COMMAND_YET("Gpx.BlendAMapBright %d,%d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8, p9); + DEBUG_COMMAND_YET("Gpx.BlendAMapBright %d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9); } static void BlendAMapAlphaSrcBright() { /* not used ? */ @@ -630,7 +630,7 @@ static void BlendAMapAlphaSrcBright() { /* not used ? */ int p9 = getCaliValue(); int p10 = getCaliValue(); - DEBUG_COMMAND_YET("Gpx.BlendAMapBright %d,%d,%d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10); + DEBUG_COMMAND_YET("Gpx.BlendAMapBright %d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10); } static void BlendUseAMapColor() { /* not used ? */ @@ -647,7 +647,7 @@ static void BlendUseAMapColor() { /* not used ? */ int p11 = getCaliValue(); int p12 = getCaliValue(); - DEBUG_COMMAND_YET("Gpx.BlendUseAMapColor %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12); + DEBUG_COMMAND_YET("Gpx.BlendUseAMapColor %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12); } static void BlendScreen() { /* not used ? */ @@ -660,7 +660,7 @@ static void BlendScreen() { /* not used ? */ int p7 = getCaliValue(); int p8 = getCaliValue(); - DEBUG_COMMAND_YET("Gpx.BlendScreen %d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8); + DEBUG_COMMAND_YET("Gpx.BlendScreen %d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8); } static void BlendMultiply() { /* not used ? */ @@ -673,7 +673,7 @@ static void BlendMultiply() { /* not used ? */ int p7 = getCaliValue(); int p8 = getCaliValue(); - DEBUG_COMMAND_YET("Gpx.BlendMultiply %d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8); + DEBUG_COMMAND_YET("Gpx.BlendMultiply %d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8); } static void BlendScreenAlpha() { /* not used ? */ @@ -687,7 +687,7 @@ static void BlendScreenAlpha() { /* not used ? */ int p8 = getCaliValue(); int p9 = getCaliValue(); - DEBUG_COMMAND_YET("Gpx.BlendScreenAlpha %d,%d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8, p9); + DEBUG_COMMAND_YET("Gpx.BlendScreenAlpha %d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9); } static void Fill() { @@ -713,7 +713,7 @@ static void Fill() { int b = getCaliValue(); surface_t *dst; - DEBUG_COMMAND("Gpx.Fill %d,%d,%d,%d,%d,%d,%d,%d:\n", ds, dx, dy, dw, dh, r, g, b); + DEBUG_COMMAND("Gpx.Fill %d,%d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, dw, dh, r, g, b); dst = sf_get(ds); gr_fill(dst, dx, dy, dw, dh, r, g, b); @@ -731,7 +731,7 @@ static void FillAlphaColor() { /* not used ? */ int lv = getCaliValue(); surface_t *dst; - DEBUG_COMMAND_YET("Gpx.FillAlphaColor %d,%d,%d,%d,%d,%d,%d,%d,%d:\n", ds, dx, dy, dw, dh, r, g, b, lv); + DEBUG_COMMAND_YET("Gpx.FillAlphaColor %d,%d,%d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, dw, dh, r, g, b, lv); dst = sf_get(ds); gr_fill_alpha_color(dst, dx, dy, dw, dh, r, g, b, lv); @@ -745,7 +745,7 @@ static void FillAMap() { /* not used ? */ int p5 = getCaliValue(); int p6 = getCaliValue(); - DEBUG_COMMAND_YET("Gpx.FillAMap %d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6); + DEBUG_COMMAND_YET("Gpx.FillAMap %d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6); } static void FillAMapOverBorder() { @@ -770,7 +770,7 @@ static void FillAMapOverBorder() { int d = getCaliValue(); surface_t *dst; - DEBUG_COMMAND("Gpx.FillAMapOverBorder %d,%d,%d,%d,%d,%d,%d:\n", ds, dx, dy, dw, dh, s, d); + DEBUG_COMMAND("Gpx.FillAMapOverBorder %d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, dw, dh, s, d); dst = sf_get(ds); gr_fill_alpha_overborder(dst, dx, dy, dw, dh, s, d); @@ -785,7 +785,7 @@ static void FillAMapUnderBorder() { /* not used ? */ int p6 = getCaliValue(); int p7 = getCaliValue(); - DEBUG_COMMAND_YET("Gpx.FillAMapUnderBorder %d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7); + DEBUG_COMMAND_YET("Gpx.FillAMapUnderBorder %d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7); } static void SaturDP_DPxSA() { /* not used ? */ @@ -798,7 +798,7 @@ static void SaturDP_DPxSA() { /* not used ? */ int p7 = getCaliValue(); int p8 = getCaliValue(); - DEBUG_COMMAND_YET("Gpx.SaturDP_DPxSA %d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8); + DEBUG_COMMAND_YET("Gpx.SaturDP_DPxSA %d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8); } static void ScreenDA_DAxSA() { /* not used ? */ @@ -811,7 +811,7 @@ static void ScreenDA_DAxSA() { /* not used ? */ int p7 = getCaliValue(); int p8 = getCaliValue(); - DEBUG_COMMAND_YET("Gpx.ScreenDA_DAxSA %d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8); + DEBUG_COMMAND_YET("Gpx.ScreenDA_DAxSA %d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8); } static void AddDA_DAxSA() { /* not used ? */ @@ -824,7 +824,7 @@ static void AddDA_DAxSA() { /* not used ? */ int p7 = getCaliValue(); int p8 = getCaliValue(); - DEBUG_COMMAND_YET("Gpx.AddDA_DAxSA %d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8); + DEBUG_COMMAND_YET("Gpx.AddDA_DAxSA %d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8); } static void SpriteCopyAMap() { @@ -852,7 +852,7 @@ static void SpriteCopyAMap() { int cl = getCaliValue(); surface_t *src, *dst; - DEBUG_COMMAND("Gpx.SpriteCopyAMap %d,%d,%d,%d,%d,%d,%d,%d,%d:\n", da, dx, dy, sa, sx, sy, sw, sh, cl); + DEBUG_COMMAND("Gpx.SpriteCopyAMap %d,%d,%d,%d,%d,%d,%d,%d,%d:", da, dx, dy, sa, sx, sy, sw, sh, cl); src = sf_get(sa); dst = sf_get(da); @@ -879,7 +879,7 @@ static void BrightDestOnly() { int r = getCaliValue(); surface_t *dst; - DEBUG_COMMAND("Gpx.BrightDestOnly %d,%d,%d,%d,%d,%d:\n", ds, dx, dy, dw, dh, r); + DEBUG_COMMAND("Gpx.BrightDestOnly %d,%d,%d,%d,%d,%d:", ds, dx, dy, dw, dh, r); dst = sf_get(ds); @@ -900,7 +900,7 @@ static void CopyTextureWrap() { /* not used ? */ int p11 = getCaliValue(); int p12 = getCaliValue(); - DEBUG_COMMAND_YET("Gpx.CopyTextureWrap %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12); + DEBUG_COMMAND_YET("Gpx.CopyTextureWrap %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12); } static void CopyTextureWrapAlpha() { /* not used ? */ @@ -918,7 +918,7 @@ static void CopyTextureWrapAlpha() { /* not used ? */ int p12 = getCaliValue(); int p13 = getCaliValue(); - DEBUG_COMMAND_YET("Gpx.CopyTextureWrapAlpha %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13); + DEBUG_COMMAND_YET("Gpx.CopyTextureWrapAlpha %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13); } static void CopyStretch() { @@ -948,7 +948,7 @@ static void CopyStretch() { int sh = getCaliValue(); surface_t *src, *dst; - DEBUG_COMMAND_YET("Gpx.CopyStretch %d,%d,%d,%d,%d,%d,%d,%d,%d,%d:\n", ds, dx, dy, dw, dh, ss, sx, sy, sw, sh); + DEBUG_COMMAND_YET("Gpx.CopyStretch %d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, dw, dh, ss, sx, sy, sw, sh); src = sf_get(ss); dst = sf_get(ds); @@ -968,7 +968,7 @@ static void CopyStretchBlend() { /* not used ? */ int p10 = getCaliValue(); int p11 = getCaliValue(); - DEBUG_COMMAND_YET("Gpx.CopyStretchBlend %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11); + DEBUG_COMMAND_YET("Gpx.CopyStretchBlend %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11); } static void CopyStretchBlendAMap() { @@ -998,7 +998,7 @@ static void CopyStretchBlendAMap() { int sh = getCaliValue(); surface_t *src, *dst; - DEBUG_COMMAND("Gpx.CopyStretchBlendAMap %d,%d,%d,%d,%d,%d,%d,%d,%d,%d:\n", ds, dx, dy, dw, dh, ss, sx, sy, sw, sh); + DEBUG_COMMAND("Gpx.CopyStretchBlendAMap %d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, dw, dh, ss, sx, sy, sw, sh); src = sf_get(ss); dst = sf_get(ds); @@ -1015,7 +1015,7 @@ static void StretchBlendScreen2x2() { /* not used ? */ int p7 = getCaliValue(); int p8 = getCaliValue(); - DEBUG_COMMAND_YET("Gpx.StretchBlendScreen2x2 %d,%d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7, p8); + DEBUG_COMMAND_YET("Gpx.StretchBlendScreen2x2 %d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8); } @@ -1049,7 +1049,7 @@ static void StretchBlendScreen2x2WDS() { int sh = getCaliValue(); surface_t *src1, *src2, *dst; - DEBUG_COMMAND("Gpx.StretchBlendScreen2x2WDS %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:\n", ds, dx, dy, ss1, sx1, sy1, ss2, sx2, sy2, sw, sh); + DEBUG_COMMAND("Gpx.StretchBlendScreen2x2WDS %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, ss1, sx1, sy1, ss2, sx2, sy2, sw, sh); src1 = sf_get(ss1); src2 = sf_get(ss2); @@ -1086,7 +1086,7 @@ static void BlendScreenWDS() { int sh = getCaliValue(); surface_t *src1, *src2, *dst; - DEBUG_COMMAND("Gpx.BlendScreenWDS %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:\n", ds, dx, dy, ss1, sx1, sy1, ss2, sx2, sy2, sw, sh); + DEBUG_COMMAND("Gpx.BlendScreenWDS %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, ss1, sx1, sy1, ss2, sx2, sy2, sw, sh); src1 = sf_get(ss1); src2 = sf_get(ss2); @@ -1149,10 +1149,10 @@ static void EffectCopy() { case 11: case 12: case 13: - DEBUG_COMMAND("Gpx.EffectCopy %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%p:\n", no, dx, dy, ss1, sx1, sy1, ss2, sx2, sy2, sw, sh, time, var); + DEBUG_COMMAND("Gpx.EffectCopy %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%p:", no, dx, dy, ss1, sx1, sy1, ss2, sx2, sy2, sw, sh, time, var); break; default: - DEBUG_COMMAND_YET("Gpx.EffectCopy %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%p:\n", no, dx, dy, ss1, sx1, sy1, ss2, sx2, sy2, sw, sh, time, var); + DEBUG_COMMAND_YET("Gpx.EffectCopy %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%p:", no, dx, dy, ss1, sx1, sy1, ss2, sx2, sy2, sw, sh, time, var); } dst = sf_get(ss1); src = sf_get(ss2); @@ -1163,7 +1163,7 @@ static void EffectCopy() { static void SetClickCancelFlag() { /* not used ? */ int p1 = getCaliValue(); - DEBUG_COMMAND_YET("Gpx.SetClikCancelFlag %d:\n", p1); + DEBUG_COMMAND_YET("Gpx.SetClikCancelFlag %d:", p1); } static const ModuleFunc functions[] = { diff --git a/modules/Gpx/effectcopy.c b/modules/Gpx/effectcopy.c index 51977bd..8fb6f50 100644 --- a/modules/Gpx/effectcopy.c +++ b/modules/Gpx/effectcopy.c @@ -26,7 +26,7 @@ void gpx_effect(int no, enum sdl_effect_type type = from_sact_effect(no); if (type == EFFECT_INVALID) { - WARNING("Unimplemented effect %d\n", no); + WARNING("Unimplemented effect %d", no); type = EFFECT_CROSSFADE; } SDL_Rect rect = { wx, wy, width, height }; diff --git a/modules/Math/Math.c b/modules/Math/Math.c index 703c594..8c1cb88 100644 --- a/modules/Math/Math.c +++ b/modules/Math/Math.c @@ -42,7 +42,7 @@ static void RandMTInit() { */ int p1 = getCaliValue(); /* ITimer */ - DEBUG_COMMAND("Math.RandMTInit %d:\n", p1); + DEBUG_COMMAND("Math.RandMTInit %d:", p1); } static void RandMTGet() { @@ -61,7 +61,7 @@ static void RandMTGet() { *var = (int)(genrand() * num) + 1; } - DEBUG_COMMAND("Math.RandMTGet %d,%p:\n", num, var); + DEBUG_COMMAND("Math.RandMTGet %d,%p:", num, var); } static void RandMTMakeNumTable() { @@ -74,7 +74,7 @@ static void RandMTMakeNumTable() { numtblmax = p1; - DEBUG_COMMAND("Math.RandMTMakeNumTable %d:\n", p1); + DEBUG_COMMAND("Math.RandMTMakeNumTable %d:", p1); } static void RandMTGetNumTable() { @@ -87,7 +87,7 @@ static void RandMTGetNumTable() { *var = (int)(genrand() * numtblmax) + 1; - DEBUG_COMMAND("Math.RandMTGetNumTable %d:\n", *var); + DEBUG_COMMAND("Math.RandMTGetNumTable %d:", *var); } static const ModuleFunc functions[] = { diff --git a/modules/MsgSkip/MsgSkip.c b/modules/MsgSkip/MsgSkip.c index 4358a82..4da2a0d 100644 --- a/modules/MsgSkip/MsgSkip.c +++ b/modules/MsgSkip/MsgSkip.c @@ -26,7 +26,7 @@ static void Init() { valid = true; *p1 = 0; - DEBUG_COMMAND("MsgSkip.Init %p,%d,%d,%d:\n", p1, p2, p3, p4); + DEBUG_COMMAND("MsgSkip.Init %p,%d,%d,%d:", p1, p2, p3, p4); } static void Start() { @@ -39,7 +39,7 @@ static void Start() { free(path); free(fname_utf8); - DEBUG_COMMAND("MsgSkip.Start %p,%d:\n", p1, p2); + DEBUG_COMMAND("MsgSkip.Start %p,%d:", p1, p2); } static void SetValid() { @@ -48,7 +48,7 @@ static void SetValid() { valid = p1; msgskip_pause(!valid); - DEBUG_COMMAND("MsgSkip.SetValid %d:\n", p1); + DEBUG_COMMAND("MsgSkip.SetValid %d:", p1); } static void GetValid() { @@ -56,7 +56,7 @@ static void GetValid() { *p1 = valid; - DEBUG_COMMAND("MsgSkip.GetValid %p:\n", p1); + DEBUG_COMMAND("MsgSkip.GetValid %p:", p1); } static void SetAction() { @@ -64,7 +64,7 @@ static void SetAction() { action = p1; - DEBUG_COMMAND("MsgSkip.SetAcion %d:\n", p1); + DEBUG_COMMAND("MsgSkip.SetAcion %d:", p1); } static void GetAction() { @@ -72,19 +72,19 @@ static void GetAction() { *p1 = action; - DEBUG_COMMAND("MsgSkip.GetAcion %p:\n", p1); + DEBUG_COMMAND("MsgSkip.GetAcion %p:", p1); } static void PushStr() { int p1 = getCaliValue(); - DEBUG_COMMAND_YET("MsgSkip.PushStr %d:\n", p1); + DEBUG_COMMAND_YET("MsgSkip.PushStr %d:", p1); } static void PopStr() { int p1 = getCaliValue(); - DEBUG_COMMAND_YET("MsgSkip.PopStr %d:\n", p1); + DEBUG_COMMAND_YET("MsgSkip.PopStr %d:", p1); } static const ModuleFunc functions[] = { diff --git a/modules/NIGHTDLL/NIGHTDLL.c b/modules/NIGHTDLL/NIGHTDLL.c index bf05e5e..5c7269e 100644 --- a/modules/NIGHTDLL/NIGHTDLL.c +++ b/modules/NIGHTDLL/NIGHTDLL.c @@ -36,7 +36,7 @@ static void Init(void) { /* 0 */ *var = 1; - DEBUG_COMMAND_YET("NIGHTDLL.Init %p:\n", var); + DEBUG_COMMAND_YET("NIGHTDLL.Init %p:", var); } static void NIGHTDLL_reset(void) { @@ -62,7 +62,7 @@ static void InitGame() { /* 1 */ ntmsg_init(); nt_sstr_init(); - DEBUG_COMMAND_YET("NIGHTDLL.InitGame:\n"); + DEBUG_COMMAND_YET("NIGHTDLL.InitGame:"); } // メッセージの枠の表示 @@ -71,7 +71,7 @@ static void SetMsgFrame() { /* 2 */ ntmsg_set_frame(p1); - DEBUG_COMMAND_YET("NIGHTDLL.SetMsgFram %d:\n", p1); + DEBUG_COMMAND_YET("NIGHTDLL.SetMsgFram %d:", p1); } // メッセージの表示位置の設定 @@ -80,21 +80,21 @@ static void SetMsgPlaceMethod(void) { /* 3 */ // 2=メッセージ枠+顔つき ntmsg_set_place(p1); - DEBUG_COMMAND_YET("NIGHTDLL.SetMsgPlaceMethod %d:\n", p1); + DEBUG_COMMAND_YET("NIGHTDLL.SetMsgPlaceMethod %d:", p1); } // 未実装? static void SetMsgDrawEffect(void) { /* 4 */ int p1 = getCaliValue(); // 0, 1, 2, 3 (実際にはどれも機能しない?) - DEBUG_COMMAND_YET("NIGHTDLL.SetMsgDrawEffect %d:\n", p1); + DEBUG_COMMAND_YET("NIGHTDLL.SetMsgDrawEffect %d:", p1); } // 未実装? static void SetMsgClearEffect(void) { /* 5 */ int p1 = getCaliValue(); // 0, 1, 2, 4 (実際にはどれも機能しない?) - DEBUG_COMMAND_YET("NIGHTDLL.SetMsgClearEffect %d:\n", p1); + DEBUG_COMMAND_YET("NIGHTDLL.SetMsgClearEffect %d:", p1); } // 壁紙CGの設定 @@ -103,7 +103,7 @@ static void SetWallPaper(void) { /* 6 */ nt_gr_set_wallpaper(p1); - DEBUG_COMMAND_YET("NIGHTDLL.SetWallPaper %d:\n", p1); + DEBUG_COMMAND_YET("NIGHTDLL.SetWallPaper %d:", p1); } // 背景CGの設定 @@ -112,7 +112,7 @@ static void SetScenery(void) { /* 7 */ nt_gr_set_scenery(p1); - DEBUG_COMMAND_YET("NIGHTDLL.SetScenery %d:\n", p1); + DEBUG_COMMAND_YET("NIGHTDLL.SetScenery %d:", p1); } // 顔CGの設定 @@ -121,7 +121,7 @@ static void SetFace(void) { /* 8 */ nt_gr_set_face(p1); - DEBUG_COMMAND_YET("NIGHTDLL.SetFace %d:\n", p1); + DEBUG_COMMAND_YET("NIGHTDLL.SetFace %d:", p1); } // 立ち絵左の設定 @@ -130,7 +130,7 @@ static void SetSpriteL(void) { /* 9 */ nt_gr_set_spL(p1); - DEBUG_COMMAND_YET("NIGHTDLL.SetSpriteL %d:\n", p1); + DEBUG_COMMAND_YET("NIGHTDLL.SetSpriteL %d:", p1); } // 立ち絵中央の設定 @@ -139,7 +139,7 @@ static void SetSpriteM(void) { /* 10 */ nt_gr_set_spM(p1); - DEBUG_COMMAND_YET("NIGHTDLL.SetSpriteM %d:\n", p1); + DEBUG_COMMAND_YET("NIGHTDLL.SetSpriteM %d:", p1); } // 立ち絵右の設定 @@ -148,7 +148,7 @@ static void SetSpriteR(void) { /* 11 */ nt_gr_set_spR(p1); - DEBUG_COMMAND_YET("NIGHTDLL.SetSpriteR %d:\n", p1); + DEBUG_COMMAND_YET("NIGHTDLL.SetSpriteR %d:", p1); } // 立ち絵左の設定（季節違い?) @@ -157,7 +157,7 @@ static void SetSpriteSeasonL(void) { /* 12 */ nt_gr_set_spsL(p1); - DEBUG_COMMAND_YET("NIGHTDLL.SetSpriteSeasonL %d:\n", p1); + DEBUG_COMMAND_YET("NIGHTDLL.SetSpriteSeasonL %d:", p1); } // 立ち絵中央の設定（季節違い?) @@ -166,7 +166,7 @@ static void SetSpriteSeasonM(void) { /* 13 */ nt_gr_set_spM(p1); - DEBUG_COMMAND_YET("NIGHTDLL.SetSpriteSeasonM %d:\n", p1); + DEBUG_COMMAND_YET("NIGHTDLL.SetSpriteSeasonM %d:", p1); } // 立ち絵右の設定（季節違い?) @@ -175,14 +175,14 @@ static void SetSpriteSeasonR(void) { /* 14 */ nt_gr_set_spsR(p1); - DEBUG_COMMAND_YET("NIGHTDLL.SetSpriteSeasonR %d:\n", p1); + DEBUG_COMMAND_YET("NIGHTDLL.SetSpriteSeasonR %d:", p1); } // 改行 static void StartNewLine(void) { /* 15 */ ntmsg_newline(); - DEBUG_COMMAND_YET("NIGHTDLL.StartNewLine:\n"); + DEBUG_COMMAND_YET("NIGHTDLL.StartNewLine:"); } // メッセージフォントサイズの設定 @@ -191,7 +191,7 @@ static void SetFontSize(void) { /* 16 */ night.fontsize = p1; - DEBUG_COMMAND_YET("NIGHTDLL.SetFontSize %d:\n", p1); + DEBUG_COMMAND_YET("NIGHTDLL.SetFontSize %d:", p1); } // フォントの種類の設定 @@ -200,7 +200,7 @@ static void SetFont(void) { /* 17 */ night.fonttype = p1; - DEBUG_COMMAND_YET("NIGHTDLL.SetFont %d:\n", p1); + DEBUG_COMMAND_YET("NIGHTDLL.SetFont %d:", p1); } // 選択肢モード ON @@ -209,7 +209,7 @@ static void SetSelMode(void) { /* 18 */ night.selmode = p1; - DEBUG_COMMAND_YET("NIGHTDLL.SetSelMode %d:\n", p1); + DEBUG_COMMAND_YET("NIGHTDLL.SetSelMode %d:", p1); } // キー入力待ち後、改ページ @@ -218,7 +218,7 @@ static void AnalyzeMessage(void) { /* 19 */ *var = ntmsg_ana(); - DEBUG_COMMAND_YET("NIGHTDLL.AnalyzeMessage %p:\n", var); + DEBUG_COMMAND_YET("NIGHTDLL.AnalyzeMessage %p:", var); } // ~DRAWの効果時間 @@ -227,7 +227,7 @@ static void SetDrawTime(void) { /* 20 */ nt_gr_set_drawtime(p1); - DEBUG_COMMAND_YET("NIGHTDLL.SetDrawTime %d:\n", p1); + DEBUG_COMMAND_YET("NIGHTDLL.SetDrawTime %d:", p1); } // 効果つき画面更新 @@ -236,7 +236,7 @@ static void Draw(void) { /* 21 */ nt_gr_draw(p1); - DEBUG_COMMAND_YET("NIGHTDLL.Draw %d:\n", p1); + DEBUG_COMMAND_YET("NIGHTDLL.Draw %d:", p1); } // 音声データを再生 @@ -245,21 +245,21 @@ static void SetVoice(void) { /* 22 */ nt_voice_set(p1); - DEBUG_COMMAND_YET("NIGHTDLL.SetVoice %d:\n", p1); + DEBUG_COMMAND_YET("NIGHTDLL.SetVoice %d:", p1); } // 未使用 static void WaitKey(void) { /* 23 */ int p1 = getCaliValue(); // - DEBUG_COMMAND_YET("NIGHTDLL.WaitKey %d:\n", p1); + DEBUG_COMMAND_YET("NIGHTDLL.WaitKey %d:", p1); } static void AddFeeling(void) { /* 24 */ int p1 = getCaliValue(); // person(1:新開,2:星川,3:百瀬,4:いずみ,5:鏡花,6:真言美,7:マコト int p2 = getCaliValue(); // val - DEBUG_COMMAND_YET("NIGHTDLL.AddFeeling %d:\n", p1); + DEBUG_COMMAND_YET("NIGHTDLL.AddFeeling %d:", p1); } @@ -267,7 +267,7 @@ static void SubFeeling(void) { /* 25 */ int p1 = getCaliValue(); // person int p2 = getCaliValue(); // val - DEBUG_COMMAND_YET("NIGHTDLL.SubFeeling %d:\n", p1); + DEBUG_COMMAND_YET("NIGHTDLL.SubFeeling %d:", p1); } static void CallEvent(void) { /* 26 */ @@ -275,7 +275,7 @@ static void CallEvent(void) { /* 26 */ nt_sco_callevent(p1); - DEBUG_COMMAND_YET("NIGHTDLL.CallEvent %d:\n", p1); + DEBUG_COMMAND_YET("NIGHTDLL.CallEvent %d:", p1); } static void ScreenCG(void) { /* 27 */ @@ -294,7 +294,7 @@ static void ScreenCG(void) { /* 27 */ nt_gr_screencg(no, x, y); - DEBUG_COMMAND_YET("NIGHTDLL.ScreenCG %d,%d,%d:\n", x, y, no); + DEBUG_COMMAND_YET("NIGHTDLL.ScreenCG %d,%d,%d:", x, y, no); } static void RunGameMain(void) { /* 28 */ @@ -310,7 +310,7 @@ static void RunGameMain(void) { /* 28 */ *p1 = nt_sco_main(p5); - DEBUG_COMMAND_YET("NIGHTDLL.RunGameMain %p,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5); + DEBUG_COMMAND_YET("NIGHTDLL.RunGameMain %p,%d,%d,%d,%d:", p1, p2, p3, p4, p5); } static void CheckNewGame(void) { /* 29 */ @@ -318,21 +318,21 @@ static void CheckNewGame(void) { /* 29 */ *p1 = 0; - DEBUG_COMMAND_YET("NIGHTDLL.CheckNewGame %p:\n", p1); + DEBUG_COMMAND_YET("NIGHTDLL.CheckNewGame %p:", p1); } static void SaveStartData(void) { /* 30 */ - DEBUG_COMMAND_YET("NIGHTDLL.SaveStartData:\n"); + DEBUG_COMMAND_YET("NIGHTDLL.SaveStartData:"); } static void PrintExitSystem(void) { /* 31 */ - DEBUG_COMMAND_YET("NIGHTDLL.PrintExitSystem:\n"); + DEBUG_COMMAND_YET("NIGHTDLL.PrintExitSystem:"); } static void SetCalendar(void) { /* 32 */ int p1 = getCaliValue(); // 0, 1, 2 - DEBUG_COMMAND_YET("NIGHTDLL.SetCalendar %d:\n", p1); + DEBUG_COMMAND_YET("NIGHTDLL.SetCalendar %d:", p1); } static void SetDate(void) { /* 33 */ @@ -344,7 +344,7 @@ static void SetDate(void) { /* 33 */ night.Day = p2; night.DayOfWeek = p3; - DEBUG_COMMAND_YET("NIGHTDLL.SetDate %d,%d,%d:\n", p1, p2, p3); + DEBUG_COMMAND_YET("NIGHTDLL.SetDate %d,%d,%d:", p1, p2, p3); } static void GetDate(void) { /* 34 */ @@ -356,11 +356,11 @@ static void GetDate(void) { /* 34 */ *p2 = night.Day; *p3 = night.DayOfWeek; - DEBUG_COMMAND_YET("NIGHTDLL.GetDate %p,%p,%p:\n", p1, p2, p3); + DEBUG_COMMAND_YET("NIGHTDLL.GetDate %p,%p,%p:", p1, p2, p3); } static void SelectGameLevel(void) { /* 35 */ - DEBUG_COMMAND_YET("NIGHTDLL.SelectGameLevel:\n"); + DEBUG_COMMAND_YET("NIGHTDLL.SelectGameLevel:"); } static void RunEventDungeon(void) { /* 36 */ @@ -369,13 +369,13 @@ static void RunEventDungeon(void) { /* 36 */ *p1 = 1; - DEBUG_COMMAND_YET("NIGHTDLL.RunEventDungeon %p,%d:\n", p1, p2); + DEBUG_COMMAND_YET("NIGHTDLL.RunEventDungeon %p,%d:", p1, p2); } static void RunEventBattle(void) { /* 37 */ int p1 = getCaliValue(); // 実際には機能しない？ - DEBUG_COMMAND_YET("NIGHTDLL.RunEventBattle %d:\n", p1); + DEBUG_COMMAND_YET("NIGHTDLL.RunEventBattle %d:", p1); } // CD再生開始 @@ -384,7 +384,7 @@ static void CDPlay(void) { /* 38 */ nt_cd_play(p1); - DEBUG_COMMAND_YET("NIGHTDLL.CDPlay %d:\n", p1); + DEBUG_COMMAND_YET("NIGHTDLL.CDPlay %d:", p1); } // CD再生停止 @@ -393,7 +393,7 @@ static void CDStop(void) { /* 39 */ nt_cd_stop(p1); - DEBUG_COMMAND_YET("NIGHTDLL.CDStop %d:\n", p1); + DEBUG_COMMAND_YET("NIGHTDLL.CDStop %d:", p1); } // CDのmute @@ -402,7 +402,7 @@ static void CDMute(void) { /* 40 */ nt_cd_mute(p1 == 0 ? FALSE : TRUE); - DEBUG_COMMAND_YET("NIGHTDLL.CDMute %d:\n", p1); + DEBUG_COMMAND_YET("NIGHTDLL.CDMute %d:", p1); } // ch に効果音番号をセット @@ -412,7 +412,7 @@ static void SoundEffectSetWave(void) { /* 41 */ nt_snd_setwave(p1, p2); - DEBUG_COMMAND_YET("NIGHTDLL.SoundEffectSetWave %d,%d:\n", p1, p2); + DEBUG_COMMAND_YET("NIGHTDLL.SoundEffectSetWave %d,%d:", p1, p2); } // ch にくり返し数をセット @@ -422,7 +422,7 @@ static void SoundEffectSetLoop(void) { /* 42 */ nt_snd_setloop(p1, p2); - DEBUG_COMMAND_YET("NIGHTDLL.SoundEffectSetLoop %d,%d:\n", p1, p2); + DEBUG_COMMAND_YET("NIGHTDLL.SoundEffectSetLoop %d,%d:", p1, p2); } // ch に音量をセット @@ -432,7 +432,7 @@ static void SoundEffectSetVolume(void) { /* 43 */ nt_snd_setvol(p1, p2); - DEBUG_COMMAND_YET("NIGHTDLL.SoundEffectSetVolue %d,%d:\n", p1, p2); + DEBUG_COMMAND_YET("NIGHTDLL.SoundEffectSetVolue %d,%d:", p1, p2); } // 効果音の再生を終るまで待つか待たないか？ @@ -442,7 +442,7 @@ static void SoundEffectSetSyncFlag(void) { /* 44 */ nt_snd_waitend(p1, p2 == 0 ? FALSE : TRUE); - DEBUG_COMMAND_YET("NIGHTDLL.SoundEffectSetSyncFlag %d,%d:\n", p1, p2); + DEBUG_COMMAND_YET("NIGHTDLL.SoundEffectSetSyncFlag %d,%d:", p1, p2); } // ch の効果音を再生 @@ -451,7 +451,7 @@ static void SoundEffectPlay(void) { /* 45 */ nt_snd_play(p1); - DEBUG_COMMAND_YET("NIGHTDLL.SoundEffectPlay %d:\n", p1); + DEBUG_COMMAND_YET("NIGHTDLL.SoundEffectPlay %d:", p1); } // ch の効果音を停止 @@ -461,7 +461,7 @@ static void SoundEffectStop(void) { /* 46 */ nt_snd_stop(p1, p2); - DEBUG_COMMAND_YET("NIGHTDLL.SoundEffectStop %d,%d:\n", p1,p2); + DEBUG_COMMAND_YET("NIGHTDLL.SoundEffectStop %d,%d:", p1,p2); } // 全てのチャンネルの再生を停止 @@ -470,86 +470,86 @@ static void SoundEffectStopAll(void) { /* 47 */ nt_snd_stopall(p1); - DEBUG_COMMAND_YET("NIGHTDLL.SoundEffectStopAll %d:\n", p1); + DEBUG_COMMAND_YET("NIGHTDLL.SoundEffectStopAll %d:", p1); } static void RunSoundMode(void) { /* 48 */ - DEBUG_COMMAND_YET("NIGHTDLL.RunSoundMode:\n"); + DEBUG_COMMAND_YET("NIGHTDLL.RunSoundMode:"); } static void RunMapEditor(void) { /* 49 */ int *p1 = getCaliVariable(); - DEBUG_COMMAND_YET("NIGHTDLL.RunMapEditor %p:\n", p1); + DEBUG_COMMAND_YET("NIGHTDLL.RunMapEditor %p:", p1); } static void VisualListClear(void) { /* 50 */ - DEBUG_COMMAND_YET("NIGHTDLL.VisualListClear:\n"); + DEBUG_COMMAND_YET("NIGHTDLL.VisualListClear:"); } static void VisualListAdd(void) { /* 51 */ int p1 = getCaliValue(); - DEBUG_COMMAND_YET("NIGHTDLL.VisualListAdd %d:\n", p1); + DEBUG_COMMAND_YET("NIGHTDLL.VisualListAdd %d:", p1); } static void GetLocalCountCG(void) { /* 52 */ int *p1 = getCaliVariable(); int p2 = getCaliValue(); - DEBUG_COMMAND_YET("NIGHTDLL.GetLocalCountCG %p,%d:\n", p1, p2); + DEBUG_COMMAND_YET("NIGHTDLL.GetLocalCountCG %p,%d:", p1, p2); } static void PlayMemory(void) { /* 53 */ int *p1 = getCaliVariable(); // 回想ページ int *p2 = getCaliVariable(); // 回想RESULT - DEBUG_COMMAND_YET("NIGHTDLL.PlayMemory %p,%p:\n", p1, p2); + DEBUG_COMMAND_YET("NIGHTDLL.PlayMemory %p,%p:", p1, p2); } static void GetEventFlagTotal(void) { /* 54 */ int *p1 = getCaliVariable(); int p2 = getCaliValue(); - DEBUG_COMMAND_YET("NIGHTDLL.GetEventFlagTotal %p,%d:\n", p1, p2); + DEBUG_COMMAND_YET("NIGHTDLL.GetEventFlagTotal %p,%d:", p1, p2); } static void SetPlayerName(void) { /* 55 */ int p1 = getCaliValue(); - DEBUG_COMMAND_YET("NIGHTDLL.SetPlayerName %d:\n", p1); + DEBUG_COMMAND_YET("NIGHTDLL.SetPlayerName %d:", p1); } static void GetPlayerName(void) { /* 56 */ int p1 = getCaliValue(); - DEBUG_COMMAND_YET("NIGHTDLL.GetPlayerName %d:\n", p1); + DEBUG_COMMAND_YET("NIGHTDLL.GetPlayerName %d:", p1); } static void SaveGame(void) { /* 57 */ int *p1 = getCaliVariable(); - DEBUG_COMMAND_YET("NIGHTDLL.SaveGame %p:\n", p1); + DEBUG_COMMAND_YET("NIGHTDLL.SaveGame %p:", p1); } static void LoadGame(void) { /* 58 */ int *p1 = getCaliVariable(); - DEBUG_COMMAND_YET("NIGHTDLL.LoadGame %p:\n", p1); + DEBUG_COMMAND_YET("NIGHTDLL.LoadGame %p:", p1); } static void ExistSaveData(void) { /* 59 */ int *p1 = getCaliVariable(); - DEBUG_COMMAND_YET("NIGHTDLL.ExistSaveData %p:\n", p1); + DEBUG_COMMAND_YET("NIGHTDLL.ExistSaveData %p:", p1); } static void ExistStartData(void) { /* 60 */ int *p1 = getCaliVariable(); - DEBUG_COMMAND_YET("NIGHTDLL.ExistStartData %p:\n", p1); + DEBUG_COMMAND_YET("NIGHTDLL.ExistStartData %p:", p1); } static void SetAreaData(void) { /* 61 */ @@ -557,27 +557,27 @@ static void SetAreaData(void) { /* 61 */ int p2 = getCaliValue(); int p3 = getCaliValue(); - DEBUG_COMMAND_YET("NIGHTDLL.SetAreaData %d,%d,%d:\n", p1, p2, p3); + DEBUG_COMMAND_YET("NIGHTDLL.SetAreaData %d,%d,%d:", p1, p2, p3); } static void RunBattleTest(void) { /* 62 */ - DEBUG_COMMAND_YET("NIGHTDLL.RunBattleTest:\n"); + DEBUG_COMMAND_YET("NIGHTDLL.RunBattleTest:"); } static void RunTrainingTest(void) { /* 63 */ - DEBUG_COMMAND_YET("NIGHTDLL.RunTrainingTest:\n"); + DEBUG_COMMAND_YET("NIGHTDLL.RunTrainingTest:"); } static void TestEventCall(void) { /* 64 */ - DEBUG_COMMAND_YET("NIGHTDLL.TestEventCall:\n"); + DEBUG_COMMAND_YET("NIGHTDLL.TestEventCall:"); } static void Test(void) { /* 65 */ - DEBUG_COMMAND_YET("NIGHTDLL.Test:\n"); + DEBUG_COMMAND_YET("NIGHTDLL.Test:"); } static void DebugScenario(void) { /* 66 */ - DEBUG_COMMAND_YET("NIGHTDLL.DebugScenario:\n"); + DEBUG_COMMAND_YET("NIGHTDLL.DebugScenario:"); } static void GetDLLTime(void) { /* 67 */ @@ -589,7 +589,7 @@ static void GetDLLTime(void) { /* 67 */ int *p6 = getCaliVariable(); int *p7 = getCaliVariable(); - DEBUG_COMMAND_YET("NIGHTDLL.GetDLLTime %p,%p,%p,%p,%p,%p,%p:\n", p1, p2, p3, p4, p5, p6, p7); + DEBUG_COMMAND_YET("NIGHTDLL.GetDLLTime %p,%p,%p,%p,%p,%p,%p:", p1, p2, p3, p4, p5, p6, p7); } static const ModuleFunc functions[] = { diff --git a/modules/NIGHTDLL/nt_msg.c b/modules/NIGHTDLL/nt_msg.c index 3104c66..876d8f4 100644 --- a/modules/NIGHTDLL/nt_msg.c +++ b/modules/NIGHTDLL/nt_msg.c @@ -184,13 +184,13 @@ void ntmsg_newline() { void ntmsg_add(const char *msg) { int len; - SACT_DEBUG("len = %d\n", strlen(msg)); + SACT_DEBUG("len = %d", strlen(msg)); if (msg[0] == '\0') return; len = MSGBUFMAX - (int)strlen(night.msgbuf); if (len < 0) { - WARNING("buf shortage (%d)\n", len); + WARNING("buf shortage (%d)", len); return; } strncat(night.msgbuf, msg, len); @@ -475,7 +475,7 @@ int ntmsg_update(sprite_t *sp, MyRectangle *r) { gre_BlendUseAMap(sf0, dx, dy, sf0, dx, dy, sp->u.msg.canvas, sx, sy, w, h, sp->u.msg.canvas, sx, sy, sp->blendrate); - SACT_DEBUG("do update no=%d, sx=%d, sy=%d, w=%d, h=%d, dx=%d, dy=%d\n", + SACT_DEBUG("do update no=%d, sx=%d, sy=%d, w=%d, h=%d, dx=%d, dy=%d", sp->no, sx, sy, w, h, dx, dy); return OK; diff --git a/modules/NIGHTDLL/nt_scenario.c b/modules/NIGHTDLL/nt_scenario.c index 01c47b5..8d4b7b6 100644 --- a/modules/NIGHTDLL/nt_scenario.c +++ b/modules/NIGHTDLL/nt_scenario.c @@ -30,7 +30,7 @@ static struct _scoadr scene2adr(int no) { struct _scoadr adr = {0, 0}; snprintf(label, 7, "E%05d", no); - SACT_DEBUG("seaching %6s\n", label); + SACT_DEBUG("seaching %6s", label); for (i = 0; i < nact->ain.fncnum; i++) { if (0 == strncmp(nact->ain.fnc[i].name, label, 6)) { adr.page = nact->ain.fnc[i].page; @@ -39,7 +39,7 @@ static struct _scoadr scene2adr(int no) { } } - WARNING("no scene %d\n", no); + WARNING("no scene %d", no); return adr; } @@ -53,7 +53,7 @@ static void ntmain(struct _scoadr inadr) { while (!nact->is_quit) { for (int cnt = 0; !nact->is_quit && !nact->wait_vsync && cnt < 10000; cnt++) { - //SACT_DEBUG("%d:%x\n", sl_getPage(), sl_getIndex()); + //SACT_DEBUG("%d:%x", sl_getPage(), sl_getIndex()); if (!nact->popupmenu_opened) { exec_command(); if (sl_getPage() == inadr.page && diff --git a/modules/NIGHTDLL/sactcg.c b/modules/NIGHTDLL/sactcg.c index a89e106..ab082df 100644 --- a/modules/NIGHTDLL/sactcg.c +++ b/modules/NIGHTDLL/sactcg.c @@ -44,7 +44,7 @@ static cginfo_t *cgs[CGMAX]; #define spcg_assert_no(no) \ if ((no) > (CGMAX -1)) { \ - WARNING("no is too large (should be %d < %d)\n", (no), CGMAX); \ + WARNING("no is too large (should be %d < %d)", (no), CGMAX); \ return NG; \ } \ @@ -71,7 +71,7 @@ static cginfo_t *nt_scg_new(enum cgtype type, int no, surface_t *sf) { */ static cginfo_t *nt_scg_get(int no) { if (no >= (CGMAX -1)) { - WARNING("no is too large (should be %d < %d)\n", (no), CGMAX); + WARNING("no is too large (should be %d < %d)", (no), CGMAX); return NULL; } @@ -80,7 +80,7 @@ static cginfo_t *nt_scg_get(int no) { surface_t *sf = sf_loadcg_no(no - 1); if (!sf) { - WARNING("load fail (%d)\n", no -1); + WARNING("load fail (%d)", no -1); return NULL; } return nt_scg_new(CG_LINKED, no, sf); diff --git a/modules/NIGHTDLL/sprite_draw.c b/modules/NIGHTDLL/sprite_draw.c index 391d220..e464a13 100644 --- a/modules/NIGHTDLL/sprite_draw.c +++ b/modules/NIGHTDLL/sprite_draw.c @@ -96,7 +96,7 @@ int nt_sp_draw2(sprite_t *sp, cginfo_t *cg, MyRectangle *r) { } } - SACT_DEBUG("do update no=%d, sx=%d, sy=%d, w=%d, h=%d, dx=%d, dy=%d\n", + SACT_DEBUG("do update no=%d, sx=%d, sy=%d, w=%d, h=%d, dx=%d, dy=%d", sp->no, sx, sy, w, h, dx, dy); return OK; @@ -136,7 +136,7 @@ int nt_sp_draw_scg(sprite_t *sp, MyRectangle *r) { sf0, dx, dy, cg->sf, sx, sy, w, h); - SACT_DEBUG("do update no=%d, sx=%d, sy=%d, w=%d, h=%d, dx=%d, dy=%d\n", + SACT_DEBUG("do update no=%d, sx=%d, sy=%d, w=%d, h=%d, dx=%d, dy=%d", sp->no, sx, sy, w, h, dx, dy); return OK; diff --git a/modules/NIGHTDLL/sprite_eupdate.c b/modules/NIGHTDLL/sprite_eupdate.c index c32c580..d1decc6 100644 --- a/modules/NIGHTDLL/sprite_eupdate.c +++ b/modules/NIGHTDLL/sprite_eupdate.c @@ -47,7 +47,7 @@ int nt_sp_eupdate(int no, int time, int cancel) { enum sdl_effect_type type = from_sact_effect(no - 100); if (type == EFFECT_INVALID) { - WARNING("Unimplemented effect %d\n", no); + WARNING("Unimplemented effect %d", no); type = EFFECT_CROSSFADE; } SDL_Rect rect = { 0, 0, sf0->width, sf0->height }; diff --git a/modules/NIGHTDLL/sprite_update.c b/modules/NIGHTDLL/sprite_update.c index 16dd9b1..a3d3a69 100644 --- a/modules/NIGHTDLL/sprite_update.c +++ b/modules/NIGHTDLL/sprite_update.c @@ -68,7 +68,7 @@ static MyRectangle get_updatearea() { // surface0との領域の積をとる SDL_IntersectRect(&rsf0, &clip, &result); - SACT_DEBUG("clipped area x=%d y=%d w=%d h=%d\n", + SACT_DEBUG("clipped area x=%d y=%d w=%d h=%d", result.x, result.y, result.w, result.h); return result; @@ -150,7 +150,7 @@ int nt_sp_updateme(sprite_t *sp) { updatearea = slist_append(updatearea, r); - SACT_DEBUG("x = %d, y = %d, spno = %d w=%d,h=%d\n", + SACT_DEBUG("x = %d, y = %d, spno = %d w=%d,h=%d", r->x, r->y, sp->no, r->w, r->h); return OK; @@ -178,7 +178,7 @@ int nt_sp_updateme_part(sprite_t *sp, int x, int y, int w, int h) { updatearea = slist_append(updatearea, r); - SACT_DEBUG("x = %d, y = %d, spno = %d w=%d,h=%d\n", + SACT_DEBUG("x = %d, y = %d, spno = %d w=%d,h=%d", r->x, r->y, sp->no, r->w, r->h); return OK; @@ -223,7 +223,7 @@ int nt_sp_draw_wall(sprite_t *sp, MyRectangle *area) { h = area->h; gr_fill(sf0, sx, sy, w, h, 0, 0, 0); - SACT_DEBUG("do update no=%d, sx=%d, sy=%d, w=%d, h=%d, \n", + SACT_DEBUG("do update no=%d, sx=%d, sy=%d, w=%d, h=%d", sp->no, sx, sy, w, h); return OK; diff --git a/modules/NightDemonDemo/NightDemonDemo.c b/modules/NightDemonDemo/NightDemonDemo.c index 737b70a..780c9c9 100644 --- a/modules/NightDemonDemo/NightDemonDemo.c +++ b/modules/NightDemonDemo/NightDemonDemo.c @@ -65,7 +65,7 @@ static void ndd_run(int demonum) { ags_updateFull(); cgdata_free(cg); } else { - WARNING("Cannot decode CG %d in %s\n", i, alk_path); + WARNING("Cannot decode CG %d in %s", i, alk_path); } int wait_ms = (i + 1) * (1000 / FPS) - (sdl_getTicks() - start); @@ -92,7 +92,7 @@ static void Init() { *var = 1; - DEBUG_COMMAND("NightDemonDemo.Init %d,%d,%d,%p:\n", p1, p2, p3, var); + DEBUG_COMMAND("NightDemonDemo.Init %d,%d,%d,%p:", p1, p2, p3, var); } static void Run() { @@ -101,7 +101,7 @@ static void Run() { ndd_run(p1); - DEBUG_COMMAND("NightDemonDemo.Run %d,%d:\n", p1, p2); + DEBUG_COMMAND("NightDemonDemo.Run %d,%d:", p1, p2); } static const ModuleFunc functions[] = { diff --git a/modules/RandMT/RandMT.c b/modules/RandMT/RandMT.c index bd2dfc1..b15069d 100644 --- a/modules/RandMT/RandMT.c +++ b/modules/RandMT/RandMT.c @@ -40,7 +40,7 @@ static void Init() { */ int p1 = getCaliValue(); /* ITimer */ - DEBUG_COMMAND_YET("RandMT.Init %p:\n", p1); + DEBUG_COMMAND_YET("RandMT.Init %p:", p1); } static void Get() { @@ -59,7 +59,7 @@ static void Get() { *var = (int)(genrand() * num) + 1; } - DEBUG_COMMAND("RandMT.Get %d,%p:\n", num, var); + DEBUG_COMMAND("RandMT.Get %d,%p:", num, var); } static void GetNoOverlap() { @@ -69,7 +69,7 @@ static void GetNoOverlap() { *var = (int)(genrand() * n) + min; - DEBUG_COMMAND("RandMT.GetNoOverlap %d,%d,%p:\n", min, n, var); + DEBUG_COMMAND("RandMT.GetNoOverlap %d,%d,%p:", min, n, var); } static const ModuleFunc functions[] = { diff --git a/modules/SACT/SACT.c b/modules/SACT/SACT.c index 576ed3c..d8ec6a7 100644 --- a/modules/SACT/SACT.c +++ b/modules/SACT/SACT.c @@ -126,7 +126,7 @@ static void Init() { sact.version = detect_sact_version(); if (!sact.version) SYSERROR("Cannot determine SACT version"); - NOTICE("SACT version = %d\n", sact.version); + NOTICE("SACT version = %d", sact.version); // 初期座標原点 sact.origin.x = 0; @@ -160,7 +160,7 @@ static void Init() { sact.logging = FALSE; } - DEBUG_COMMAND("SACT.Init %d:\n", p1); + DEBUG_COMMAND("SACT.Init %d:", p1); } /** @@ -181,7 +181,7 @@ static void CreateSprite() { sp_new(wNum, wNumCG1, wNumCG2, wNumCG3, wType); - DEBUG_COMMAND_YET("SACT.CreateSprite %d,%d,%d,%d,%d:\n", wNum, wNumCG1, wNumCG2, wNumCG3, wType); + DEBUG_COMMAND_YET("SACT.CreateSprite %d,%d,%d,%d,%d:", wNum, wNumCG1, wNumCG2, wNumCG3, wType); } /** @@ -202,7 +202,7 @@ static void CreateTextSprite() { sp_new_msg(wNum, wX, wY, wWidth, wHeight); - DEBUG_COMMAND_YET("SACT.CreateTextSprite %d,%d,%d,%d,%d:\n", wNum, wX, wY, wWidth, wHeight); + DEBUG_COMMAND_YET("SACT.CreateTextSprite %d,%d,%d,%d,%d:", wNum, wX, wY, wWidth, wHeight); } /** @@ -215,7 +215,7 @@ static void SetWallPaper() { sp_set_wall_paper(wNum); - DEBUG_COMMAND_YET("SACT.SetWallPaper %d:\n", wNum); + DEBUG_COMMAND_YET("SACT.SetWallPaper %d:", wNum); } /** @@ -225,7 +225,7 @@ static void SetWallPaper() { static void Clear() { sp_free_all(); - DEBUG_COMMAND_YET("SACT.Clear:\n"); + DEBUG_COMMAND_YET("SACT.Clear:"); } /** @@ -238,7 +238,7 @@ static void Delete() { sp_free(wNum); - DEBUG_COMMAND_YET("SACT.Delete %d:\n", wNum); + DEBUG_COMMAND_YET("SACT.Delete %d:", wNum); } /** @@ -256,7 +256,7 @@ static void SpriteDeleteCount() { sp_free(i); } - DEBUG_COMMAND_YET("SACT.SpriteDeleteCount %d,%d:\n", wNum, wCount); + DEBUG_COMMAND_YET("SACT.SpriteDeleteCount %d,%d:", wNum, wCount); } /** @@ -266,7 +266,7 @@ static void SpriteDeleteCount() { static void Draw() { sp_update_all(TRUE); - DEBUG_COMMAND_YET("SACT.Draw:\n"); + DEBUG_COMMAND_YET("SACT.Draw:"); } /** @@ -287,7 +287,7 @@ static void DrawEffect() { sp_eupdate(wType, wEffectTime, wEffectkey); - DEBUG_COMMAND_YET("SACT.DrawEffect %d,%d,%d:\n", wType, wEffectTime, wEffectkey); + DEBUG_COMMAND_YET("SACT.DrawEffect %d,%d,%d:", wType, wEffectTime, wEffectkey); } /** @@ -304,7 +304,7 @@ static void DrawEffectAlphaMap() { sp_eupdate_amap(nIndexAlphaMap, wEffectTime, wEffectKey); - DEBUG_COMMAND_YET("SACT.DrawEffectAlphaMap %d,%d,%d:\n", nIndexAlphaMap, wEffectTime, wEffectKey); + DEBUG_COMMAND_YET("SACT.DrawEffectAlphaMap %d,%d,%d:", nIndexAlphaMap, wEffectTime, wEffectKey); } /** @@ -331,7 +331,7 @@ static void QuakeScreen() { sp_quake_screen(wType, wParam1, wParam2, wCount, nfKeyEnable); - DEBUG_COMMAND_YET("SACT.QuakeScreen %d,%d,%d,%d,%d:\n", wType, wParam1, wParam2, wCount, nfKeyEnable); + DEBUG_COMMAND_YET("SACT.QuakeScreen %d,%d,%d,%d,%d:", wType, wParam1, wParam2, wCount, nfKeyEnable); } /** @@ -347,7 +347,7 @@ static void SetOrigin() { sact.origin.x = wX; sact.origin.y = wY; - DEBUG_COMMAND_YET("SACT.SetOrigin %d,%d:\n", wX, wY); + DEBUG_COMMAND_YET("SACT.SetOrigin %d,%d:", wX, wY); } /** @@ -364,7 +364,7 @@ static void SetShow() { sp_set_show(wNum, wCount, wShow); - DEBUG_COMMAND_YET("SACT.SetShow %d,%d,%d:\n", wNum, wCount, wShow); + DEBUG_COMMAND_YET("SACT.SetShow %d,%d,%d:", wNum, wCount, wShow); } /** @@ -381,7 +381,7 @@ static void SetBlendRate() { sp_set_blendrate(wNum, wCount, nBlendRate); - DEBUG_COMMAND_YET("SACT.SetBlendRate %d,%d,%d:\n", wNum, wCount, nBlendRate); + DEBUG_COMMAND_YET("SACT.SetBlendRate %d,%d,%d:", wNum, wCount, nBlendRate); } /** @@ -398,7 +398,7 @@ static void SetPos() { sp_set_pos(wNum, wX, wY); - DEBUG_COMMAND_YET("SACT.SetPos %d,%d,%d:\n", wNum, wX, wY); + DEBUG_COMMAND_YET("SACT.SetPos %d,%d,%d:", wNum, wX, wY); } /** @@ -415,7 +415,7 @@ static void SetMove() { sp_set_move(wNum, wX, wY); - DEBUG_COMMAND_YET("SACT.SetMove %d,%d,%d:\n", wNum, wX, wY); + DEBUG_COMMAND_YET("SACT.SetMove %d,%d,%d:", wNum, wX, wY); } /** @@ -430,7 +430,7 @@ static void SetMoveTime() { sp_set_movetime(wNum, wTime); - DEBUG_COMMAND_YET("SACT.SetMoveTime %d,%d:\n", wNum, wTime); + DEBUG_COMMAND_YET("SACT.SetMoveTime %d,%d:", wNum, wTime); } /** @@ -445,7 +445,7 @@ static void SetMoveSpeed() { sp_set_movespeed(wNum, wSpeed); - DEBUG_COMMAND_YET("SACT.SetMoveSpeed %d,%d:\n", wNum, wSpeed); + DEBUG_COMMAND_YET("SACT.SetMoveSpeed %d,%d:", wNum, wSpeed); } /** @@ -465,7 +465,7 @@ static void SetMoveSpeedCount() { sp_set_movespeed(i, wSpeed); } - DEBUG_COMMAND_YET("SACT.SetMoveSpeedCount %d,%d,%d:\n", wNum, wCount, wSpeed); + DEBUG_COMMAND_YET("SACT.SetMoveSpeedCount %d,%d,%d:", wNum, wCount, wSpeed); } /** @@ -485,7 +485,7 @@ static void SetSpriteAnimeTimeInterval() { sp_set_animeinterval(i, nTime); } - DEBUG_COMMAND_YET("SACT.SetSpriteAnimeTimeInterval %d,%d,%d:\n", wNum, wCount, nTime); + DEBUG_COMMAND_YET("SACT.SetSpriteAnimeTimeInterval %d,%d,%d:", wNum, wCount, nTime); } /** @@ -498,7 +498,7 @@ static void AddZKeyHideSprite() { sp_add_zkey_hidesprite(wNum); - DEBUG_COMMAND_YET("SACT.AddZKeyHideSprite %d:\n", wNum); + DEBUG_COMMAND_YET("SACT.AddZKeyHideSprite %d:", wNum); } /** @@ -508,7 +508,7 @@ static void AddZKeyHideSprite() { static void ClearZKeyHideSprite() { sp_clear_zkey_hidesprite_all(); - DEBUG_COMMAND_YET("SACT.ClearZKeyHideSprite:\n"); + DEBUG_COMMAND_YET("SACT.ClearZKeyHideSprite:"); } /** @@ -524,7 +524,7 @@ static void SpriteFreeze() { sp_freeze_sprite(wNum, wIndex); - DEBUG_COMMAND_YET("SACT.SpriteFreeze %d,%d:\n", wNum, wIndex); + DEBUG_COMMAND_YET("SACT.SpriteFreeze %d,%d:", wNum, wIndex); } /** @@ -537,7 +537,7 @@ static void SpriteThaw() { sp_thaw_sprite(wNum); - DEBUG_COMMAND_YET("SACT.SpriteThaw %d:\n", wNum); + DEBUG_COMMAND_YET("SACT.SpriteThaw %d:", wNum); } /** @@ -557,7 +557,7 @@ static void SpriteFreezeCount() { sp_freeze_sprite(i, wIndex); } - DEBUG_COMMAND_YET("SACT.SpriteFreezeCount %d,%d,%d:\n", wNum, wCount, wIndex); + DEBUG_COMMAND_YET("SACT.SpriteFreezeCount %d,%d,%d:", wNum, wCount, wIndex); } /** @@ -575,7 +575,7 @@ static void SpriteThawCount() { sp_thaw_sprite(i); } - DEBUG_COMMAND_YET("SACT.SpriteThawCount %d,%d:\n", wNum, wCount); + DEBUG_COMMAND_YET("SACT.SpriteThawCount %d,%d:", wNum, wCount); } /** @@ -588,7 +588,7 @@ static void QuakeSpriteAdd() { sp_add_quakesprite(wNum); - DEBUG_COMMAND_YET("SACT.QuakeSpriteAdd %d:\n", wNum); + DEBUG_COMMAND_YET("SACT.QuakeSpriteAdd %d:", wNum); } /** @@ -597,7 +597,7 @@ static void QuakeSpriteAdd() { */ static void QuakeSpriteReset() { sp_clear_quakesprite_all(); - DEBUG_COMMAND_YET("SACT.QuakeSpriteReset:\n"); + DEBUG_COMMAND_YET("SACT.QuakeSpriteReset:"); } /** @@ -623,7 +623,7 @@ static void QuakeSprite() { sp_quake_sprite(wType, wAmplitudeX, wAmplitudeY, wCount, nfKeyEnable); - DEBUG_COMMAND_YET("SACT.QuakeSprite %d,%d,%d,%d:\n", wType, wAmplitudeX, wAmplitudeY, wCount); + DEBUG_COMMAND_YET("SACT.QuakeSprite %d,%d,%d,%d:", wType, wAmplitudeX, wAmplitudeY, wCount); } /** @@ -638,7 +638,7 @@ static void QuerySpriteIsExist() { sp_query_isexist(wNum, var); - DEBUG_COMMAND_YET("SACT.QuerySpriteIsExist %d,%p:\n", wNum, var); + DEBUG_COMMAND_YET("SACT.QuerySpriteIsExist %d,%p:", wNum, var); } /** @@ -659,7 +659,7 @@ static void QuerySpriteInfo() { sp_query_info(wNum, vType, vCG1, vCG2, vCG3); - DEBUG_COMMAND_YET("SACT.QuerySpriteInfo %d,%p,%p,%p,%p:\n", wNum, vType, vCG1, vCG2, vCG3); + DEBUG_COMMAND_YET("SACT.QuerySpriteInfo %d,%p,%p,%p,%p:", wNum, vType, vCG1, vCG2, vCG3); } /** @@ -674,7 +674,7 @@ static void QuerySpriteShow() { sp_query_show(wNum, vShow); - DEBUG_COMMAND_YET("SACT.QuerySpriteShow %d,%p:\n", wNum, vShow); + DEBUG_COMMAND_YET("SACT.QuerySpriteShow %d,%p:", wNum, vShow); } /** @@ -691,7 +691,7 @@ static void QuerySpritePos() { sp_query_pos(wNum, vX, vY); - DEBUG_COMMAND_YET("SACT.QuerySpritePos %d,%p,%p:\n", wNum, vX, vY); + DEBUG_COMMAND_YET("SACT.QuerySpritePos %d,%p,%p:", wNum, vX, vY); } /** @@ -708,7 +708,7 @@ static void QuerySpriteSize() { sp_query_size(wNum, vWidth, vHeight); - DEBUG_COMMAND_YET("SACT.QuerySpriteSize %d,%p,%p:\n", wNum, vWidth, vHeight); + DEBUG_COMMAND_YET("SACT.QuerySpriteSize %d,%p,%p:", wNum, vWidth, vHeight); } /** @@ -725,7 +725,7 @@ static void QueryTextPos() { sp_query_textpos(wNum, vX, vY); - DEBUG_COMMAND_YET("SACT.QueryTextPos %d,%p,%p:\n", wNum, vX, vY); + DEBUG_COMMAND_YET("SACT.QueryTextPos %d,%p,%p:", wNum, vX, vY); } /** @@ -735,7 +735,7 @@ static void QueryTextPos() { static void CG_Clear() { scg_freeall(); - DEBUG_COMMAND_YET("SACT.CG_Clear:\n"); + DEBUG_COMMAND_YET("SACT.CG_Clear:"); } /** @@ -748,7 +748,7 @@ static void CG_Reset() { scg_free(wNumCG); - DEBUG_COMMAND_YET("SACT.CG_Reset %d:\n", wNumCG); + DEBUG_COMMAND_YET("SACT.CG_Reset %d:", wNumCG); } /** @@ -764,7 +764,7 @@ static void CG_QueryType() { scg_querytype(wNumCG, vType); - DEBUG_COMMAND_YET("SACT.CG_QueryType %d,%p:\n", wNumCG, vType); + DEBUG_COMMAND_YET("SACT.CG_QueryType %d,%p:", wNumCG, vType); } /** @@ -781,7 +781,7 @@ static void CG_QuerySize() { scg_querysize(wNumCG, vWidth, vHeight); - DEBUG_COMMAND_YET("SACT.CG_QuerySize %d,%p,%p:\n", wNumCG, vWidth, vHeight); + DEBUG_COMMAND_YET("SACT.CG_QuerySize %d,%p,%p:", wNumCG, vWidth, vHeight); } /** @@ -796,7 +796,7 @@ static void CG_QueryBpp() { scg_querybpp(wNumCG, vBpp); - DEBUG_COMMAND_YET("SACT.CG_QueryBpp %d,%p:\n", wNumCG, vBpp); + DEBUG_COMMAND_YET("SACT.CG_QueryBpp %d,%p:", wNumCG, vBpp); } /** @@ -811,7 +811,7 @@ static void CG_ExistAlphaMap() { scg_existalphamap(wNumCG, vMask); - DEBUG_COMMAND_YET("SACT.CG_ExistAlphaMap %d,%p:\n", wNumCG, vMask); + DEBUG_COMMAND_YET("SACT.CG_ExistAlphaMap %d,%p:", wNumCG, vMask); } /** @@ -836,7 +836,7 @@ static void CG_Create() { scg_create(wNumCG, wWidth, wHeight, wR, wG, wB, wBlendRate); - DEBUG_COMMAND_YET("SACT.CG_Create %d,%d,%d,%d,%d,%d,%d:\n", wNumCG, wWidth, wHeight, wR, wG, wB, wBlendRate); + DEBUG_COMMAND_YET("SACT.CG_Create %d,%d,%d,%d,%d,%d,%d:", wNumCG, wWidth, wHeight, wR, wG, wB, wBlendRate); } /** @@ -855,7 +855,7 @@ static void CG_CreateReverse() { scg_create_reverse(wNumCG, wNumSrcCG, wReverseX, wReverseY); - DEBUG_COMMAND_YET("SACT.CG_CreateReverse %d,%d,%d,%d:\n", wNumCG, wNumSrcCG, wReverseX, wReverseY); + DEBUG_COMMAND_YET("SACT.CG_CreateReverse %d,%d,%d,%d:", wNumCG, wNumSrcCG, wReverseX, wReverseY); } /** @@ -874,7 +874,7 @@ static void CG_CreateStretch() { scg_create_stretch(wNumCG, wWidth, wHeight, wNumSrcCG); - DEBUG_COMMAND_YET("SACT.CG_CreateStretch %d,%d,%d,%d:\n", wNumCG, wWidth, wHeight, wNumSrcCG); + DEBUG_COMMAND_YET("SACT.CG_CreateStretch %d,%d,%d,%d:", wNumCG, wWidth, wHeight, wNumSrcCG); } /** @@ -895,7 +895,7 @@ static void CG_CreateBlend() { int wNumBlendCG = getCaliValue(); int wAlphaMapMode = getCaliValue(); - DEBUG_COMMAND_YET("SACT.CG_CreateBlend %d,%d,%d,%d,%d,%d:\n", wNumDstCG, wNumBaseCG, wX, wY, wNumBlendCG, wAlphaMapMode); + DEBUG_COMMAND_YET("SACT.CG_CreateBlend %d,%d,%d,%d,%d,%d:", wNumDstCG, wNumBaseCG, wX, wY, wNumBlendCG, wAlphaMapMode); scg_create_blend(wNumDstCG, wNumBaseCG, wX, wY, wNumBlendCG, wAlphaMapMode); } @@ -920,7 +920,7 @@ static void CG_CreateText() { scg_create_text(wNumCG, wSize, wR, wG, wB, wText); - DEBUG_COMMAND_YET("SACT.CG_CreateText %d,%d,%d,%d,%d,%d:\n", wNumCG, wSize, wR, wG, wB, wText); + DEBUG_COMMAND_YET("SACT.CG_CreateText %d,%d,%d,%d,%d,%d:", wNumCG, wSize, wR, wG, wB, wText); } /** @@ -948,7 +948,7 @@ static void CG_CreateTextNum() { scg_create_textnum(wNumCG, wSize, wR, wG, wB, wFigs, wZeroPadding, wValue); - DEBUG_COMMAND_YET("SACT.CG_CreateTextNum %d,%d,%d,%d,%d,%d,%d,%d:\n", wNumCG, wSize, wR, wG, wB, wFigs, wZeroPadding, wValue); + DEBUG_COMMAND_YET("SACT.CG_CreateTextNum %d,%d,%d,%d,%d,%d,%d,%d:", wNumCG, wSize, wR, wG, wB, wFigs, wZeroPadding, wValue); } /** @@ -963,7 +963,7 @@ static void CG_Copy() { scg_copy(wNumDst, wNumSrc); - DEBUG_COMMAND_YET("SACT.CG_Copy %d,%d:\n", wNumDst, wNumSrc); + DEBUG_COMMAND_YET("SACT.CG_Copy %d,%d:", wNumDst, wNumSrc); } /** @@ -986,7 +986,7 @@ static void CG_Cut() { scg_cut(wNumDstCG, wNumSrcCG, wX, wY, wWidth, wHeight); - DEBUG_COMMAND_YET("SACT.CG_Cut %d,%d,%d,%d,%d,%d:\n", wNumDstCG, wNumSrcCG, wX, wY, wWidth, wHeight); + DEBUG_COMMAND_YET("SACT.CG_Cut %d,%d,%d,%d,%d,%d:", wNumDstCG, wNumSrcCG, wX, wY, wWidth, wHeight); } /** @@ -1010,7 +1010,7 @@ static void CG_PartCopy() { scg_partcopy(wNumDstCG, wNumSrcCG, wX, wY, wWidth, wHeight); - DEBUG_COMMAND_YET("SACT.PartCopy %d,%d,%d,%d,%d,%d:\n", wNumDstCG, wNumSrcCG, wX, wY, wWidth, wHeight); + DEBUG_COMMAND_YET("SACT.PartCopy %d,%d,%d,%d,%d,%d:", wNumDstCG, wNumSrcCG, wX, wY, wWidth, wHeight); } /** @@ -1021,7 +1021,7 @@ static void CG_PartCopy() { static void WaitKeySimple() { int *vKey = getCaliVariable(); - DEBUG_COMMAND_YET("SACT.WaitKeySimple %d:\n", vKey); + DEBUG_COMMAND_YET("SACT.WaitKeySimple %d:", vKey); // とりあえず全更新 sp_update_all(TRUE); @@ -1057,7 +1057,7 @@ static void WaitKeyMessage() { smsg_keywait(wMessageMark1, wMessageMark2, wMessageLength); - DEBUG_COMMAND_YET("SACT.WaitKeyMessage %d,%d,%d:\n", wMessageMark1, wMessageMark2, wMessageLength); + DEBUG_COMMAND_YET("SACT.WaitKeyMessage %d,%d,%d:", wMessageMark1, wMessageMark2, wMessageLength); } /** @@ -1074,11 +1074,11 @@ static void WaitKeySprite() { int *vRsv1 = getCaliVariable(); int *vRsv2 = getCaliVariable(); - DEBUG_COMMAND("SACT.WaitKeySprite %p,%p,%p,%p:\n", vOK, vRND, vRsv1, vRsv2); + DEBUG_COMMAND("SACT.WaitKeySprite %p,%p,%p,%p:", vOK, vRND, vRsv1, vRsv2); sp_keywait(vOK, vRND, vRsv1, vRsv2, NULL, -1); - DEBUG_COMMAND_YET("SACT.WaitKeySprite %d,%d,%d,%d:\n", *vOK, *vRND, *vRsv1, *vRsv2); + DEBUG_COMMAND_YET("SACT.WaitKeySprite %d,%d,%d,%d:", *vOK, *vRND, *vRsv1, *vRsv2); } /** @@ -1091,8 +1091,8 @@ static void PeekKey() { int nKeyCode = getCaliValue(); int *vResult = getCaliVariable(); - WARNING("NOT IMPLEMENTED\n"); - DEBUG_COMMAND_YET("SACT.PeekKey %d,%p:\n", nKeyCode, vResult); + WARNING("NOT IMPLEMENTED"); + DEBUG_COMMAND_YET("SACT.PeekKey %d,%p:", nKeyCode, vResult); } /** @@ -1100,8 +1100,8 @@ static void PeekKey() { * 文字送りキーが押されっぱなしの時、離されるまで待つ */ static void WaitMsgSkipKeyUp() { - WARNING("NOT IMPLEMENTED\n"); - DEBUG_COMMAND_YET("SACT.WaitMsgSkipKeyUp:\n"); + WARNING("NOT IMPLEMENTED"); + DEBUG_COMMAND_YET("SACT.WaitMsgSkipKeyUp:"); } /** @@ -1130,7 +1130,7 @@ static void WaitKeySimpleTimeOut() { sact.waittype = KEYWAIT_NONE; - DEBUG_COMMAND_YET("SACT.WaitKeySimpleTimeOut %p,%p,%d:\n", vRND, vD03, wTime); + DEBUG_COMMAND_YET("SACT.WaitKeySimpleTimeOut %p,%p,%d:", vRND, vD03, wTime); } /** @@ -1153,7 +1153,7 @@ static void WaitKeySpriteTimeOut() { sp_keywait(vOK, vRND, vD01, vD02, vD03, wTime); - DEBUG_COMMAND_YET("SACT.WaitKeySpriteTimeOut %p,%p,%p,%p,%p,%d:\n", vOK, vRND, vD01, vD02, vD03, wTime); + DEBUG_COMMAND_YET("SACT.WaitKeySpriteTimeOut %p,%p,%p,%p,%p,%d:", vOK, vRND, vD01, vD02, vD03, wTime); } /** @@ -1166,7 +1166,7 @@ static void QueryMessageSkip() { *vSkip = msgskip_isSkipping() ? 1 : 0; - DEBUG_COMMAND_YET("SACT.QueryMessageSkip %p:\n", vSkip); + DEBUG_COMMAND_YET("SACT.QueryMessageSkip %p:", vSkip); } /** @@ -1181,7 +1181,7 @@ static void RegistReplaceString() { sstr_regist_replace(sstr, dstr); - DEBUG_COMMAND_YET("SACT.RegistReplaceString %d,%d:\n", sstr, dstr); + DEBUG_COMMAND_YET("SACT.RegistReplaceString %d,%d:", sstr, dstr); } /** @@ -1221,7 +1221,7 @@ static void MessageOutput() { smsg_out(wMessageSpriteNumber, wMessageSize, wMessageColorR, wMessageColorG, wMessageColorB, wMessageFont, wMessageSpeed, wMessageLineSpace, wMessageAlign, 0, 0, 0, vMessageLength); - DEBUG_COMMAND_YET("SACT.MessageOutput %d,%d,%d,%d,%d,%d,%d,%d,%d,%p:\n", wMessageSpriteNumber, wMessageSize, wMessageColorR, wMessageColorG, wMessageColorB, wMessageFont, wMessageSpeed, wMessageLineSpace, wMessageAlign, vMessageLength); + DEBUG_COMMAND_YET("SACT.MessageOutput %d,%d,%d,%d,%d,%d,%d,%d,%d,%p:", wMessageSpriteNumber, wMessageSize, wMessageColorR, wMessageColorG, wMessageColorB, wMessageFont, wMessageSpeed, wMessageLineSpace, wMessageAlign, vMessageLength); } /** @@ -1265,7 +1265,7 @@ static void MessageOutputEx() { smsg_out(wMessageSpriteNumber, wMessageSize, wMessageColorR, wMessageColorG, wMessageColorB, wMessageFont, wMessageSpeed, wMessageLineSpace, wMessageAlign, wRubySize, wRubyFont, wRubyLineSpace, vLength); - DEBUG_COMMAND_YET("SACT.MessageOutputEx %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%p:\n", wMessageSpriteNumber, wMessageSize, wMessageColorR, wMessageColorG, wMessageColorB, wMessageFont, wMessageSpeed, wMessageLineSpace,wMessageAlign, wRubySize, wRubyFont, wRubyLineSpace, vLength); + DEBUG_COMMAND_YET("SACT.MessageOutputEx %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%p:", wMessageSpriteNumber, wMessageSize, wMessageColorR, wMessageColorG, wMessageColorB, wMessageFont, wMessageSpeed, wMessageLineSpace,wMessageAlign, wRubySize, wRubyFont, wRubyLineSpace, vLength); } /** @@ -1280,7 +1280,7 @@ static void MessageNewLine() { smsg_newline(wMessageSpriteNumber, wMessageSize); - DEBUG_COMMAND_YET("SACT.MessageNewLine %d,%d:\n", wMessageSpriteNumber, wMessageSize); + DEBUG_COMMAND_YET("SACT.MessageNewLine %d,%d:", wMessageSpriteNumber, wMessageSize); } /** @@ -1293,7 +1293,7 @@ static void MessageClear() { smsg_clear(wMessageSpriteNumber); - DEBUG_COMMAND_YET("SACT.MessageClear %d:\n", wMessageSpriteNumber); + DEBUG_COMMAND_YET("SACT.MessageClear %d:", wMessageSpriteNumber); } /** @@ -1306,7 +1306,7 @@ static void MessageIsEmpty() { *wResult = smsg_is_empty(); - DEBUG_COMMAND_YET("SACT.MessageIsEmpty %p:\n", wResult); + DEBUG_COMMAND_YET("SACT.MessageIsEmpty %p:", wResult); } /** @@ -1319,9 +1319,9 @@ static void MessagePeek() { int *vCount = getCaliVariable(); int nTopStringNum = getCaliValue(); - WARNING("NOT IMPLEMENTED\n"); + WARNING("NOT IMPLEMENTED"); - DEBUG_COMMAND_YET("SACT.MessagePeek %p,%d:\n", vCount, nTopStringNum); + DEBUG_COMMAND_YET("SACT.MessagePeek %p,%d:", vCount, nTopStringNum); } /** @@ -1330,7 +1330,7 @@ static void MessagePeek() { */ static void Log_Stop() { sact.logging = FALSE; - DEBUG_COMMAND_YET("SACT.Log_Stop:\n"); + DEBUG_COMMAND_YET("SACT.Log_Stop:"); } /** @@ -1339,7 +1339,7 @@ static void Log_Stop() { */ static void Log_Start() { sact.logging = TRUE; - DEBUG_COMMAND_YET("SACT.Log_Start:\n"); + DEBUG_COMMAND_YET("SACT.Log_Start:"); } /** @@ -1349,7 +1349,7 @@ static void Log_Start() { static void MenuClear() { ssel_clear(); - DEBUG_COMMAND_YET("SACT.MenuClear:\n"); + DEBUG_COMMAND_YET("SACT.MenuClear:"); } /** @@ -1364,7 +1364,7 @@ static void MenuAdd() { ssel_add(nString, wI); - DEBUG_COMMAND_YET("SACT.MenuAdd %d,%d:\n", nString, wI); + DEBUG_COMMAND_YET("SACT.MenuAdd %d,%d:", nString, wI); } /** @@ -1393,7 +1393,7 @@ static void MenuOpen() { *wMenuResult = ssel_select(wNum, wChoiceSize, wMenuOutSpc, wChoiceLineSpace, wChoiceAutoMoveCursor, nAlign); - DEBUG_COMMAND_YET("SACT.MenuOpen %p,%d,%d,%d,%d,%d,%d:\n", wMenuResult, wNum, wChoiceSize, wMenuOutSpc, wChoiceLineSpace, wChoiceAutoMoveCursor, nAlign); + DEBUG_COMMAND_YET("SACT.MenuOpen %p,%d,%d,%d,%d,%d,%d:", wMenuResult, wNum, wChoiceSize, wMenuOutSpc, wChoiceLineSpace, wChoiceAutoMoveCursor, nAlign); } /** @@ -1406,7 +1406,7 @@ static void PushString() { sstr_push(nString); - DEBUG_COMMAND_YET("SACT.PushString %d:\n", nString); + DEBUG_COMMAND_YET("SACT.PushString %d:", nString); } /** @@ -1419,7 +1419,7 @@ static void PopString() { sstr_pop(nString); - DEBUG_COMMAND_YET("SACT.PopString %d:\n", nString); + DEBUG_COMMAND_YET("SACT.PopString %d:", nString); } /** @@ -1442,7 +1442,7 @@ static void Numeral_SetCG() { sp_num_setcg(nNum, nIndex, nCG); - DEBUG_COMMAND_YET("SACT.Numeral_SetCG %d,%d,%d:\n", nNum, nIndex, nCG); + DEBUG_COMMAND_YET("SACT.Numeral_SetCG %d,%d,%d:", nNum, nIndex, nCG); } /** @@ -1459,7 +1459,7 @@ static void Numeral_GetCG() { sp_num_getcg(nNum, nIndex, vCG); - DEBUG_COMMAND_YET("SACT.Numeral_GetCG %d,%d,%p:\n", nNum, nIndex, vCG); + DEBUG_COMMAND_YET("SACT.Numeral_GetCG %d,%d,%p:", nNum, nIndex, vCG); } /** @@ -1476,7 +1476,7 @@ static void Numeral_SetPos() { sp_num_setpos(nNum, nX, nY); - DEBUG_COMMAND_YET("SACT.Numeral_SetPos %d,%d,%d:\n", nNum, nX, nY); + DEBUG_COMMAND_YET("SACT.Numeral_SetPos %d,%d,%d:", nNum, nX, nY); } /** @@ -1493,7 +1493,7 @@ static void Numeral_GetPos() { sp_num_getpos(nNum, vX, vY); - DEBUG_COMMAND_YET("SACT.Numeral_GetPos %d,%p,%p:\n", nNum, vX, vY); + DEBUG_COMMAND_YET("SACT.Numeral_GetPos %d,%p,%p:", nNum, vX, vY); } /** @@ -1508,7 +1508,7 @@ static void Numeral_SetSpan() { sp_num_setspan(nNum, nSpan); - DEBUG_COMMAND_YET("SACT.Numeral_SetSpan %d,%d:\n", nNum, nSpan); + DEBUG_COMMAND_YET("SACT.Numeral_SetSpan %d,%d:", nNum, nSpan); } /** @@ -1523,7 +1523,7 @@ static void Numeral_GetSpan() { sp_num_getspan(nNum, vSpan); - DEBUG_COMMAND_YET("SACT.Numeral_GetSpan %d,%p:\n", nNum, vSpan); + DEBUG_COMMAND_YET("SACT.Numeral_GetSpan %d,%p:", nNum, vSpan); } /** @@ -1531,7 +1531,7 @@ static void Numeral_GetSpan() { * 説明スプライト設定クリア */ static void ExpSp_Clear() { - DEBUG_COMMAND_YET("SACT.ExpSp_Clear:\n"); + DEBUG_COMMAND_YET("SACT.ExpSp_Clear:"); sp_exp_clear(); } @@ -1548,7 +1548,7 @@ static void ExpSp_Add() { sp_exp_add(wNumSP1, wNumSP2); - DEBUG_COMMAND_YET("SACT.ExpSp_Add %d,%d:\n", wNumSP1, wNumSP2); + DEBUG_COMMAND_YET("SACT.ExpSp_Add %d,%d:", wNumSP1, wNumSP2); } /** @@ -1561,7 +1561,7 @@ static void ExpSp_Del() { sp_exp_del(wNum); - DEBUG_COMMAND_YET("SACT.ExpSp_Del %d:\n", wNum); + DEBUG_COMMAND_YET("SACT.ExpSp_Del %d:", wNum); } /** @@ -1576,7 +1576,7 @@ static void TimerSet() { stimer_reset(wTimerID, wCount); - DEBUG_COMMAND("SACT.TimerSet %d,%d:\n", wTimerID, wCount); + DEBUG_COMMAND("SACT.TimerSet %d,%d:", wTimerID, wCount); } /** @@ -1591,7 +1591,7 @@ static void TimerGet() { *vRND = stimer_get(wTimerID); - DEBUG_COMMAND("SACT.TimerGet %d,%p:\n", wTimerID, vRND); + DEBUG_COMMAND("SACT.TimerGet %d,%p:", wTimerID, vRND); } /** @@ -1608,7 +1608,7 @@ static void TimerWait() { sys_keywait(10, KEYWAIT_NONCANCELABLE); } - DEBUG_COMMAND("SACT.TimerWait %d,%d:\n", wTimerID, wCount); + DEBUG_COMMAND("SACT.TimerWait %d,%d:", wTimerID, wCount); } /** @@ -1621,7 +1621,7 @@ static void Wait() { sys_keywait(wCount*10, KEYWAIT_NONCANCELABLE); - DEBUG_COMMAND_YET("SACT.Wait %d:\n", wCount); + DEBUG_COMMAND_YET("SACT.Wait %d:", wCount); } /** @@ -1634,7 +1634,7 @@ static void SoundPlay() { ssnd_play(wNum); - DEBUG_COMMAND_YET("SACT.SoundPlay %d:\n", wNum); + DEBUG_COMMAND_YET("SACT.SoundPlay %d:", wNum); } /** @@ -1649,7 +1649,7 @@ static void SoundStop() { ssnd_stop(wNum, wFadeTime); - DEBUG_COMMAND_YET("SACT.SoundStop %d,%d:\n", wNum, wFadeTime); + DEBUG_COMMAND_YET("SACT.SoundStop %d,%d:", wNum, wFadeTime); } /** @@ -1663,7 +1663,7 @@ static void SoundStopAll() { ssnd_stopall(wFadeTime); - DEBUG_COMMAND_YET("SACT.SoundStopAll %d:\n", wFadeTime); + DEBUG_COMMAND_YET("SACT.SoundStopAll %d:", wFadeTime); } /** @@ -1676,7 +1676,7 @@ static void SoundWait() { ssnd_wait(wNum); - DEBUG_COMMAND_YET("SACT.SoundWait %d:\n", wNum); + DEBUG_COMMAND_YET("SACT.SoundWait %d:", wNum); } /** @@ -1691,7 +1691,7 @@ static void SoundWaitKey() { ssnd_waitkey(wNum, vKey); - DEBUG_COMMAND_YET("SACT.SoundWaitKey %d,%p:\n", wNum, vKey); + DEBUG_COMMAND_YET("SACT.SoundWaitKey %d,%p:", wNum, vKey); } /** @@ -1704,7 +1704,7 @@ static void SoundPrepare() { ssnd_prepare(wNum); - DEBUG_COMMAND_YET("SACT.SoundPrepare %d:\n", wNum); + DEBUG_COMMAND_YET("SACT.SoundPrepare %d:", wNum); } /** @@ -1717,7 +1717,7 @@ static void SoundPrepareLR() { ssnd_prepareLRrev(wNum); - DEBUG_COMMAND_YET("SACT.SoundPrepareLR %d:\n", wNum); + DEBUG_COMMAND_YET("SACT.SoundPrepareLR %d:", wNum); } /** @@ -1730,7 +1730,7 @@ static void SoundPlayLR() { ssnd_playLRrev(wNum); - DEBUG_COMMAND_YET("SACT.SoundPlayLR %d:\n", wNum); + DEBUG_COMMAND_YET("SACT.SoundPlayLR %d:", wNum); } /** @@ -1754,7 +1754,7 @@ static void SpriteSound() { sp_sound_set(i, wNumWave1, wNumWave2, wNumWave3); } - DEBUG_COMMAND_YET("SACT.SpriteSound %d,%d,%d,%d,%d:\n", wNumSP, nCount, wNumWave1, wNumWave2, wNumWave3); + DEBUG_COMMAND_YET("SACT.SpriteSound %d,%d,%d,%d,%d:", wNumSP, nCount, wNumWave1, wNumWave2, wNumWave3); } /** @@ -1762,7 +1762,7 @@ static void SpriteSound() { * SpriteSoundで設定したすべての音の再生終了まで待つ (~SP_SOUND_WAIT) */ static void SpriteSoundWait() { - DEBUG_COMMAND_YET("SACT.SpriteSoundWait:\n"); + DEBUG_COMMAND_YET("SACT.SpriteSoundWait:"); sp_sound_wait(); } @@ -1777,7 +1777,7 @@ static void SpriteSoundOB() { sp_sound_ob(wNumWave); - DEBUG_COMMAND_YET("SACT.SpriteSoundOB %d:\n", wNumWave); + DEBUG_COMMAND_YET("SACT.SpriteSoundOB %d:", wNumWave); } /** @@ -1792,7 +1792,7 @@ static void MusicCheck() { *vRND = smus_check(wNum); - DEBUG_COMMAND_YET("SACT.MusicCheck %d,%p:\n", wNum, vRND); + DEBUG_COMMAND_YET("SACT.MusicCheck %d,%p:", wNum, vRND); } /** @@ -1807,7 +1807,7 @@ static void MusicGetLength() { *vRND = smus_getlength(wNum); - DEBUG_COMMAND_YET("SACT.MusicGetLength %d,%d:\n", wNum, *vRND); + DEBUG_COMMAND_YET("SACT.MusicGetLength %d,%d:", wNum, *vRND); } /** @@ -1822,7 +1822,7 @@ static void MusicGetPos() { *vRND = smus_getpos(wNum); - DEBUG_COMMAND_YET("SACT.MusicGetPos %d,%d:\n", wNum, *vRND); + DEBUG_COMMAND_YET("SACT.MusicGetPos %d,%d:", wNum, *vRND); } /** @@ -1839,7 +1839,7 @@ static void MusicPlay() { smus_play(wNum, wFadeTime, wVolume); - DEBUG_COMMAND_YET("SACT.MusicPlay %d,%d,%d:\n", wNum, wFadeTime, wVolume); + DEBUG_COMMAND_YET("SACT.MusicPlay %d,%d,%d:", wNum, wFadeTime, wVolume); } /** @@ -1854,7 +1854,7 @@ static void MusicStop() { smus_stop(wNum, wFadeTime); - DEBUG_COMMAND_YET("SACT.MusicStop %d,%d:\n", wNum, wFadeTime); + DEBUG_COMMAND_YET("SACT.MusicStop %d,%d:", wNum, wFadeTime); } /** @@ -1867,7 +1867,7 @@ static void MusicStopAll() { smus_stopall(wFadeTime); - DEBUG_COMMAND_YET("SACT.MusicStopAll %d:\n", wFadeTime); + DEBUG_COMMAND_YET("SACT.MusicStopAll %d:", wFadeTime); } /** @@ -1884,7 +1884,7 @@ static void MusicFade() { smus_fade(wNum, wFadeTime, wVolume); - DEBUG_COMMAND_YET("SACT.MusicFade %d,%d,%d:\n", wNum, wFadeTime, wVolume); + DEBUG_COMMAND_YET("SACT.MusicFade %d,%d,%d:", wNum, wFadeTime, wVolume); } /** @@ -1903,7 +1903,7 @@ static void MusicWait() { smus_wait(wNum, nTimeOut); - DEBUG_COMMAND_YET("SACT.MusicWait %d,%d:\n", wNum, nTimeOut); + DEBUG_COMMAND_YET("SACT.MusicWait %d,%d:", wNum, nTimeOut); } /** @@ -1919,7 +1919,7 @@ static void MusicWaitPos() { smus_waitpos(wNum, wIndex); - DEBUG_COMMAND_YET("SACT.MusicWaitPos %d,%d:\n", wNum, wIndex); + DEBUG_COMMAND_YET("SACT.MusicWaitPos %d,%d:", wNum, wIndex); } /** @@ -1934,7 +1934,7 @@ static void SoundGetLinkNum() { *vRND = ssnd_getlinknum(wNum); - DEBUG_COMMAND_YET("SACT.SoundGetLinkNum %d,%p:\n", wNum, vRND); + DEBUG_COMMAND_YET("SACT.SoundGetLinkNum %d,%p:", wNum, vRND); } /** @@ -1959,7 +1959,7 @@ static void ChartPos() { schart_pos(pos, pos1, pos2, val1, val2, val); - DEBUG_COMMAND_YET("SACT.ChartPos %p,%d,%d,%d,%d,%d:\n", pos, pos1, pos2, val1, val2, val); + DEBUG_COMMAND_YET("SACT.ChartPos %p,%d,%d,%d,%d,%d:", pos, pos1, pos2, val1, val2, val); } /** @@ -1978,7 +1978,7 @@ static void NumToStr() { sstr_num2str(strno, fig, zeropad, num); - DEBUG_COMMAND_YET("SACT.NumToStr %d,%d,%d,%d:\n", strno, fig, zeropad, num); + DEBUG_COMMAND_YET("SACT.NumToStr %d,%d,%d,%d:", strno, fig, zeropad, num); } /** @@ -1988,9 +1988,9 @@ static void Maze_Create() { int p1 = getCaliValue(); int p2 = getCaliValue(); - WARNING("NOT IMPLEMENTED\n"); + WARNING("NOT IMPLEMENTED"); - DEBUG_COMMAND_YET("SACT.Maze_Create %d,%d:\n", p1,p2); + DEBUG_COMMAND_YET("SACT.Maze_Create %d,%d:", p1,p2); } /** @@ -2001,9 +2001,9 @@ static void Maze_Get() { int p2 = getCaliValue(); int p3 = getCaliValue(); - WARNING("NOT IMPLEMENTED\n"); + WARNING("NOT IMPLEMENTED"); - DEBUG_COMMAND_YET("SACT.Maze_Get %p,%d,%d:\n", p1,p2,p3); + DEBUG_COMMAND_YET("SACT.Maze_Get %p,%d,%d:", p1,p2,p3); } /** @@ -2016,7 +2016,7 @@ static void EncryptWORD() { scryp_encrypt_word(array, num, key); - DEBUG_COMMAND_YET("SACT.EncryptWORD %p,%d,%d:\n", array, num, key); + DEBUG_COMMAND_YET("SACT.EncryptWORD %p,%d,%d:", array, num, key); } /** @@ -2029,7 +2029,7 @@ static void DecryptWORD() { scryp_encrypt_word(array, num, key); - DEBUG_COMMAND_YET("SACT.DecryptWORD %p,%d,%d:\n", array, num, key); + DEBUG_COMMAND_YET("SACT.DecryptWORD %p,%d,%d:", array, num, key); } /** @@ -2041,7 +2041,7 @@ static void EncryptString() { scryp_encrypt_str(p1, p2); - DEBUG_COMMAND_YET("SACT.EncryptString %d,%d:\n", p1,p2); + DEBUG_COMMAND_YET("SACT.EncryptString %d,%d:", p1,p2); } /** @@ -2053,7 +2053,7 @@ static void DecryptString() { scryp_decrypt_str(p1, p2); - DEBUG_COMMAND_YET("SACT.DecryptString %d,%d:\n", p1,p2); + DEBUG_COMMAND_YET("SACT.DecryptString %d,%d:", p1,p2); } /** @@ -2063,7 +2063,7 @@ static void DecryptString() { static void XMenuClear() { spxm_clear(); - DEBUG_COMMAND_YET("SACT.XMenuClear:\n"); + DEBUG_COMMAND_YET("SACT.XMenuClear:"); } /** @@ -2078,7 +2078,7 @@ static void XMenuRegister() { spxm_register(nRegiNum, nMenuID); - DEBUG_COMMAND_YET("SACT.XMenuRegister %d,%d:\n", nRegiNum, nMenuID); + DEBUG_COMMAND_YET("SACT.XMenuRegister %d,%d:", nRegiNum, nMenuID); } /** @@ -2093,7 +2093,7 @@ static void XMenuGetNum() { *vMenuID = spxm_getnum(nRegiNum); - DEBUG_COMMAND_YET("SACT.XMenuGetNum %d,%p:\n", nRegiNum, vMenuID); + DEBUG_COMMAND_YET("SACT.XMenuGetNum %d,%p:", nRegiNum, vMenuID); } /** @@ -2108,7 +2108,7 @@ static void XMenuGetText() { spxm_gettext(nRegiNum, strno); - DEBUG_COMMAND_YET("SACT.XMenuGetText %d,%d:\n", nRegiNum, strno); + DEBUG_COMMAND_YET("SACT.XMenuGetText %d,%d:", nRegiNum, strno); } /** @@ -2118,7 +2118,7 @@ static void XMenuGetText() { static void XMenuTitleRegister() { spxm_titlereg(); - DEBUG_COMMAND_YET("SACT.XMenuTitleRegister:\n"); + DEBUG_COMMAND_YET("SACT.XMenuTitleRegister:"); } /** @@ -2131,7 +2131,7 @@ static void XMenuTitleGet() { spxm_titleget(strno); - DEBUG_COMMAND_YET("SACT.XMenuTitleGet %d:\n", strno); + DEBUG_COMMAND_YET("SACT.XMenuTitleGet %d:", strno); } static void SACT_reset(void) { diff --git a/modules/SACT/sactcg.c b/modules/SACT/sactcg.c index fc401ef..27012ff 100644 --- a/modules/SACT/sactcg.c +++ b/modules/SACT/sactcg.c @@ -41,7 +41,7 @@ #define spcg_assert_no(no) \ if ((no) > (CGMAX -1)) { \ - WARNING("no is too large (should be %d < %d)\n", (no), CGMAX); \ + WARNING("no is too large (should be %d < %d)", (no), CGMAX); \ return NG; \ } \ @@ -68,7 +68,7 @@ static cginfo_t *scg_new(enum cgtype type, int no, surface_t *sf) { */ static cginfo_t *scg_get(int no) { if (no >= (CGMAX -1)) { - WARNING("no is too large (should be %d < %d)\n", (no), CGMAX); + WARNING("no is too large (should be %d < %d)", (no), CGMAX); return NULL; } @@ -77,7 +77,7 @@ static cginfo_t *scg_get(int no) { surface_t *sf = sf_loadcg_no(no - 1); if (!sf) { - WARNING("load fail (%d)\n", no -1); + WARNING("load fail (%d)", no -1); return NULL; } return scg_new(CG_LINKED, no, sf); diff --git a/modules/SACT/sactcrypto.c b/modules/SACT/sactcrypto.c index b791b3e..cbf5c30 100644 --- a/modules/SACT/sactcrypto.c +++ b/modules/SACT/sactcrypto.c @@ -32,22 +32,22 @@ */ int scryp_encrypt_word(int *array, int num, int key) { - WARNING("NOT IMPLEMENTED\n"); + WARNING("NOT IMPLEMENTED"); return OK; } int scryp_decrypt_word(int *array, int num, int key) { - WARNING("NOT IMPLEMENTED\n"); + WARNING("NOT IMPLEMENTED"); return OK; } int scryp_encrypt_str(int strno, int key) { - WARNING("NOT IMPLEMENTED\n"); + WARNING("NOT IMPLEMENTED"); return OK; } int scryp_decrypt_str(int strno, int key) { - WARNING("str = '%s'\n", svar_get(strno)); - WARNING("NOT IMPLEMENTED\n"); + WARNING("str = '%s'", svar_get(strno)); + WARNING("NOT IMPLEMENTED"); return OK; } diff --git a/modules/SACT/sactsound.c b/modules/SACT/sactsound.c index 8d2a3f4..9659362 100644 --- a/modules/SACT/sactsound.c +++ b/modules/SACT/sactsound.c @@ -167,7 +167,7 @@ int ssnd_playLRrev(int no) { // 指定の番号の効果音が存在するかどうかをチェック int ssnd_getlinknum(int no) { - WARNING("NOT IMPLEMENTED\n"); + WARNING("NOT IMPLEMENTED"); return OK; } diff --git a/modules/SACT/sprite.c b/modules/SACT/sprite.c index 2325382..3511ab9 100644 --- a/modules/SACT/sprite.c +++ b/modules/SACT/sprite.c @@ -44,14 +44,14 @@ static int compare_spriteno_smallfirst(const void *a, const void *b); #define sp_assert_no(no) do { \ if ((no) >= SPRITEMAX) { \ - WARNING("no is too large (should be %d < %d)\n", no, SPRITEMAX); \ + WARNING("no is too large (should be %d < %d)", no, SPRITEMAX); \ return NG; \ } \ } while (0) #define sp_assert_null(no) do { \ if (sact.sp[no] == NULL) { \ - WARNING("sprite %d is NULL\n", no); \ + WARNING("sprite %d is NULL", no); \ return NG; \ } \ } while (0) @@ -81,7 +81,7 @@ static int sp_draw_wall(sprite_t *sp) { h = sact.updaterect.h; gr_fill(sf0, sx, sy, w, h, 0, 0, 0); - SACT_DEBUG("do update no=%d, sx=%d, sy=%d, w=%d, h=%d, \n", + SACT_DEBUG("do update no=%d, sx=%d, sy=%d, w=%d, h=%d", sp->no, sx, sy, w, h); return OK; @@ -711,7 +711,7 @@ int sp_sound_set(int wNumSP, int wNumWave1, int wNumWave2, int wNumWave3) { // すべてのスプライトサウンドの終了を待つ int sp_sound_wait() { - WARNING("NOT IMPLEMENTED\n"); + WARNING("NOT IMPLEMENTED"); return OK; } diff --git a/modules/SACT/sprite_anime.c b/modules/SACT/sprite_anime.c index eabf061..c06ddf1 100644 --- a/modules/SACT/sprite_anime.c +++ b/modules/SACT/sprite_anime.c @@ -62,7 +62,7 @@ static int eventCB_ANIM(sprite_t *sp, agsevent_t *e) { sp->curcg = sp->cg3; break; } - // SACT_DEBUG("anime update\n"); + // SACT_DEBUG("anime update"); // カウントアップ sp->u.anime.tick++; diff --git a/modules/SACT/sprite_draw.c b/modules/SACT/sprite_draw.c index 25b9237..ba97c7b 100644 --- a/modules/SACT/sprite_draw.c +++ b/modules/SACT/sprite_draw.c @@ -137,7 +137,7 @@ int sp_draw2(sprite_t *sp, cginfo_t *cg) { } } - SACT_DEBUG("do update no=%d, sx=%d, sy=%d, w=%d, h=%d, dx=%d, dy=%d\n", sp->no, sx, sy, w, h, dx, dy); + SACT_DEBUG("do update no=%d, sx=%d, sy=%d, w=%d, h=%d, dx=%d, dy=%d", sp->no, sx, sy, w, h, dx, dy); return OK; } diff --git a/modules/SACT/sprite_eupdate.c b/modules/SACT/sprite_eupdate.c index fbe425e..25eb469 100644 --- a/modules/SACT/sprite_eupdate.c +++ b/modules/SACT/sprite_eupdate.c @@ -48,7 +48,7 @@ int sp_eupdate(int type, int time, int cancel) { enum sdl_effect_type sdl_effect = from_sact_effect(type); if (sdl_effect == EFFECT_INVALID) { - WARNING("Unimplemented effect %d\n", type); + WARNING("Unimplemented effect %d", type); type = EFFECT_CROSSFADE; } SDL_Rect rect = { 0, 0, sf0->width, sf0->height }; diff --git a/modules/SACT/sprite_event.c b/modules/SACT/sprite_event.c index ceec9e8..5f8e319 100644 --- a/modules/SACT/sprite_event.c +++ b/modules/SACT/sprite_event.c @@ -91,7 +91,7 @@ static void cb_focused_swsp(void* s, void* data) { int *update = (int *)data; boolean oldstate = sp->show; - SACT_DEBUG("show up spex %d\n", sp->no); + SACT_DEBUG("show up spex %d", sp->no); sp->show = TRUE; if (oldstate != sp->show) { @@ -109,7 +109,7 @@ static void cb_defocused_swsp(void* s, void* data) { int *update = (int *)data; boolean oldstate = sp->show; - SACT_DEBUG("hide spex %d\n", sp->no); + SACT_DEBUG("hide spex %d", sp->no); sp->show = FALSE; if (oldstate != sp->show) { @@ -173,7 +173,7 @@ static int cb_focused(sprite_t *sp) { update++; } sp->focused = TRUE; - SACT_DEBUG("get forcused %d, type %d\n", sp->no, sp->type); + SACT_DEBUG("get forcused %d, type %d", sp->no, sp->type); if (sp->numsound1) { ssnd_play(sp->numsound1); } @@ -196,7 +196,7 @@ static int cb_defocused(sprite_t *sp) { sp->curcg = sp->cg1; update++; sp->focused = FALSE; - SACT_DEBUG("lost forcused %d\n", sp->no); + SACT_DEBUG("lost forcused %d", sp->no); } return update; diff --git a/modules/SACT/sprite_move.c b/modules/SACT/sprite_move.c index 28aec8d..a4e4bad 100644 --- a/modules/SACT/sprite_move.c +++ b/modules/SACT/sprite_move.c @@ -75,7 +75,7 @@ static int move_cb(sprite_t *sp, agsevent_t *e) { // 現在時刻の取得 now = sact.movecurtime; - SACT_DEBUG("no = %d now = %d st = %d, ed = %d\n", + SACT_DEBUG("no = %d now = %d st = %d, ed = %d", sp->no, now, sp->move.starttime, sp->move.endtime); if (now >= sp->move.endtime) { @@ -139,7 +139,7 @@ void spev_move_setup(void* data, void* userdata) { // タイマコールバック登録 spev_add_teventlistener(sp, move_cb); - SACT_DEBUG("no=%d,from(%d,%d@%d)to(%d,%d@%d),time=%d\n", sp->no, + SACT_DEBUG("no=%d,from(%d,%d@%d)to(%d,%d@%d),time=%d", sp->no, sp->cur.x, sp->cur.y, sp->move.starttime, sp->move.to.x, sp->move.to.y, sp->move.endtime, sp->move.time); diff --git a/modules/SACT/sprite_msg.c b/modules/SACT/sprite_msg.c index 2962565..863d3af 100644 --- a/modules/SACT/sprite_msg.c +++ b/modules/SACT/sprite_msg.c @@ -194,7 +194,7 @@ void smsg_add(const char *msg) { len = MSGBUFMAX - (int)strlen(sact.msgbuf); if (len < 0) { - WARNING("buf shortage (%d)\n", len); + WARNING("buf shortage (%d)", len); return; } @@ -461,7 +461,7 @@ int smsg_update(sprite_t *sp) { gre_BlendUseAMap(sf0, dx, dy, sf0, dx, dy, sp->u.msg.canvas, sx, sy, w, h, sp->u.msg.canvas, sx, sy, sp->blendrate); - SACT_DEBUG("do update no=%d, sx=%d, sy=%d, w=%d, h=%d, dx=%d, dy=%d\n", + SACT_DEBUG("do update no=%d, sx=%d, sy=%d, w=%d, h=%d, dx=%d, dy=%d", sp->no, sx, sy, w, h, dx, dy); return OK; diff --git a/modules/SACT/sprite_update.c b/modules/SACT/sprite_update.c index 1a60a97..13eaceb 100644 --- a/modules/SACT/sprite_update.c +++ b/modules/SACT/sprite_update.c @@ -64,7 +64,7 @@ static void get_updatearea() { // surface0との領域の積をとる SDL_IntersectRect(&rsf0, &clip, &sact.updaterect); - SACT_DEBUG("clipped area x=%d y=%d w=%d h=%d\n", + SACT_DEBUG("clipped area x=%d y=%d w=%d h=%d", sact.updaterect.x, sact.updaterect.y, sact.updaterect.w, sact.updaterect.h); @@ -168,7 +168,7 @@ int sp_updateme(sprite_t *sp) { updatearea = slist_append(updatearea, r); - SACT_DEBUG("x = %d, y = %d, spno = %d w=%d,h=%d\n", + SACT_DEBUG("x = %d, y = %d, spno = %d w=%d,h=%d", r->x, r->y, sp->no, r->w, r->h); return OK; @@ -196,7 +196,7 @@ int sp_updateme_part(sprite_t *sp, int x, int y, int w, int h) { updatearea = slist_append(updatearea, r); - SACT_DEBUG("x = %d, y = %d, spno = %d w=%d,h=%d\n", + SACT_DEBUG("x = %d, y = %d, spno = %d w=%d,h=%d", r->x, r->y, sp->no, r->w, r->h); return OK; diff --git a/modules/ShArray/ShArray.c b/modules/ShArray/ShArray.c index 920bf4c..87bff67 100644 --- a/modules/ShArray/ShArray.c +++ b/modules/ShArray/ShArray.c @@ -49,7 +49,7 @@ static void GetAtArray(void) { /* 0 */ int *vResult = getCaliVariable(); int i, j; - DEBUG_COMMAND("ShArray.GetAtArray %p,%d,%d,%p:\n", vAry, cnt, type, vResult); + DEBUG_COMMAND("ShArray.GetAtArray %p,%d,%d,%p:", vAry, cnt, type, vResult); j = *vAry; vAry++; for (i = 1; i < cnt; i++) { @@ -93,7 +93,7 @@ static void AddAtArray(void) { /* 1 */ int cnt = getCaliValue(); int i; - DEBUG_COMMAND("ShArray.AddAtArray %p,%p,%d:\n", vAry1, vAry2, cnt); + DEBUG_COMMAND("ShArray.AddAtArray %p,%p,%d:", vAry1, vAry2, cnt); for (i = 0; i < cnt; i++) { int result = (*vAry1) + (*vAry2); @@ -119,7 +119,7 @@ static void SubAtArray(void) { /* 2 */ int cnt = getCaliValue(); int i; - DEBUG_COMMAND("ShArray.SubAtArray %p,%p,%d:\n", vAry1, vAry2, cnt); + DEBUG_COMMAND("ShArray.SubAtArray %p,%p,%d:", vAry1, vAry2, cnt); for (i = 0; i < cnt; i++) { int result = (*vAry1) - (*vAry2); @@ -145,7 +145,7 @@ static void MulAtArray(void) { /* 3 */ int cnt = getCaliValue(); int i; - DEBUG_COMMAND("ShArray.MulAtArray %p,%p,%d:\n", vAry1, vAry2, cnt); + DEBUG_COMMAND("ShArray.MulAtArray %p,%p,%d:", vAry1, vAry2, cnt); for (i = 0; i < cnt; i++) { int result = (*vAry1) * (*vAry2); @@ -171,7 +171,7 @@ static void DivAtArray(void) { /* 4 */ int cnt = getCaliValue(); int i; - DEBUG_COMMAND("ShArray.DivAtArray: %d,%d,%d:\n", vAry1, vAry2, cnt); + DEBUG_COMMAND("ShArray.DivAtArray: %d,%d,%d:", vAry1, vAry2, cnt); for (i = 0; i < cnt; i++) { if (*vAry2 == 0) { @@ -201,7 +201,7 @@ static void MinAtArray(void) { /* 5 */ int cnt = getCaliValue(); int i; - DEBUG_COMMAND("ShArray.MinAtArray: %d,%d,%d:\n", vAry1, vAry2, cnt); + DEBUG_COMMAND("ShArray.MinAtArray: %d,%d,%d:", vAry1, vAry2, cnt); for (i = 0; i < cnt; i++) { if (*vAry1 < *vAry2) { @@ -224,7 +224,7 @@ static void MaxAtArray(void) { /* 6 */ int cnt = getCaliValue(); int i; - DEBUG_COMMAND("ShArray.MaxAtArray: %d,%d,%d:\n", vAry1, vAry2, cnt); + DEBUG_COMMAND("ShArray.MaxAtArray: %d,%d,%d:", vAry1, vAry2, cnt); for (i = 0; i < cnt; i++) { if (*vAry1 > *vAry2) { @@ -247,7 +247,7 @@ static void AndNumArray(void) { /* 7 */ int val = getCaliValue(); int i; - DEBUG_COMMAND("ShArray.AndNumArray: %p,%d,%d:\n", vAry, cnt, val); + DEBUG_COMMAND("ShArray.AndNumArray: %p,%d,%d:", vAry, cnt, val); for (i = 0; i < cnt; i++) { (*vAry) &= val; @@ -268,7 +268,7 @@ static void OrNumArray(void) { /* 8 */ int val = getCaliValue(); int i; - DEBUG_COMMAND_YET("ShArray.OrNumArray: %p,%d,%d:\n", vAry, cnt, val); + DEBUG_COMMAND_YET("ShArray.OrNumArray: %p,%d,%d:", vAry, cnt, val); for (i = 0; i < cnt; i++) { (*vAry) |= val; @@ -289,7 +289,7 @@ static void XorNumArray(void) { /* 9 */ int val = getCaliValue(); int i; - DEBUG_COMMAND("ShArray.XorNumArray %p,%d,%d:\n", vAry, cnt, val); + DEBUG_COMMAND("ShArray.XorNumArray %p,%d,%d:", vAry, cnt, val); for (i = 0; i < cnt; i++) { (*vAry) ^= val; @@ -313,7 +313,7 @@ static void SetEquArray(void) { /* 10 */ int *vResults = getCaliVariable(); int i; - DEBUG_COMMAND("ShArray.SetEquArray %p,%d,%d,%p:\n", vAry, cnt, val, vResults); + DEBUG_COMMAND("ShArray.SetEquArray %p,%d,%d,%p:", vAry, cnt, val, vResults); for (i = 0; i < cnt; i++) { *vResults = (*vAry == val) ? 1 : 0; @@ -337,7 +337,7 @@ static void SetNotArray(void) { /* 11 */ int *vResults = getCaliVariable(); int i; - DEBUG_COMMAND("ShArray.SetNotArray %p,%d,%d,%p:\n", vAry, cnt, val, vResults); + DEBUG_COMMAND("ShArray.SetNotArray %p,%d,%d,%p:", vAry, cnt, val, vResults); for (i = 0; i < cnt; i++) { *vResults = (*vAry != val) ? 1 : 0; @@ -360,7 +360,7 @@ static void SetLowArray(void) { /* 12 */ int *vResults = getCaliVariable(); int i; - DEBUG_COMMAND("ShArray.SetLowArray %p,%d,%d,%p:\n", vAry, cnt, val, vResults); + DEBUG_COMMAND("ShArray.SetLowArray %p,%d,%d,%p:", vAry, cnt, val, vResults); for (i = 0; i < cnt; i++) { (*vResults) = ((*vAry < val) ? 1 : 0); @@ -383,7 +383,7 @@ static void SetHighArray(void) { /* 13 */ int *vResults = getCaliVariable(); int i; - DEBUG_COMMAND("ShArray.SetHighArray %p,%d,%d,%p:\n", vAry, cnt, val, vResults); + DEBUG_COMMAND("ShArray.SetHighArray %p,%d,%d,%p:", vAry, cnt, val, vResults); for (i = 0; i < cnt; i++) { (*vResults) = ((*vAry > val) ? 1 : 0); @@ -410,7 +410,7 @@ static void SetRangeArray(void) { /* 14 */ int *vResults = getCaliVariable(); int i; - DEBUG_COMMAND("ShArray.SetRangeArray %p,%d,%d,%d,%p:\n", vAry, cnt, min, max, vResults); + DEBUG_COMMAND("ShArray.SetRangeArray %p,%d,%d,%d,%p:", vAry, cnt, min, max, vResults); for (i = 0; i < cnt; i++) { *vResults = ((*vAry > min) && (*vAry < max)) ? 1 : 0; @@ -437,7 +437,7 @@ static void SetAndEquArray(void) { /* 15 */ int *vResults = getCaliVariable(); int i; - DEBUG_COMMAND("ShArray.SetAndEquArray: %p,%d,%d,%d,%p:\n", vAry, mask, cnt, val, vResults); + DEBUG_COMMAND("ShArray.SetAndEquArray: %p,%d,%d,%d,%p:", vAry, mask, cnt, val, vResults); for (i = 0; i < cnt; i++) { *vResults = ((*vAry & mask) == val) ? 1 : 0; @@ -461,7 +461,7 @@ static void AndEquArray(void) { /* 16 */ int *vResults = getCaliVariable(); int i; - DEBUG_COMMAND("ShArray.AndEquArray %p,%d,%d,%p:\n", vAry, cnt, val, vResults); + DEBUG_COMMAND("ShArray.AndEquArray %p,%d,%d,%p:", vAry, cnt, val, vResults); for (i = 0; i < cnt; i++) { *vResults &= ((*vAry == val) ? 1 : 0); @@ -485,7 +485,7 @@ static void AndNotArray(void) { /* 17 */ int *vResults = getCaliVariable(); int i; - DEBUG_COMMAND("ShArray.AndNotArray %p,%d,%d,%p:\n", vAry, cnt, val, vResults); + DEBUG_COMMAND("ShArray.AndNotArray %p,%d,%d,%p:", vAry, cnt, val, vResults); for (i = 0; i < cnt; i++) { *vResults &= ((*vAry != val) ? 1 : 0); @@ -509,7 +509,7 @@ static void AndLowArray(void) { /* 18 */ int *vResults = getCaliVariable(); int i; - DEBUG_COMMAND("ShArray.AndLowArray: %d,%d,%d,%d:\n", vAry, cnt, min, vResults); + DEBUG_COMMAND("ShArray.AndLowArray: %d,%d,%d,%d:", vAry, cnt, min, vResults); for (i = 0; i < cnt; i++) { *vResults &= ((*vAry < min) ? 1 : 0); @@ -533,7 +533,7 @@ static void AndHighArray(void) { /* 19 */ int *vResults = getCaliVariable(); int i; - DEBUG_COMMAND("ShArray.AndHighArray: %p,%d,%d,%p:\n", vAry, cnt, max, vResults); + DEBUG_COMMAND("ShArray.AndHighArray: %p,%d,%d,%p:", vAry, cnt, max, vResults); for (i = 0; i < cnt; i++) { *vResults &= ((*vAry > max) ? 1 : 0); @@ -559,7 +559,7 @@ static void AndRangeArray(void) { /* 20 */ int *vResults = getCaliVariable(); int i; - DEBUG_COMMAND("ShArray.AndRangeArray %d,%d,%d,%d,%d:\n", vAry, cnt, min, max, vResults); + DEBUG_COMMAND("ShArray.AndRangeArray %d,%d,%d,%d,%d:", vAry, cnt, min, max, vResults); for (i = 0; i < cnt; i++) { *vResults &= (((*vAry > min) && (*vAry < max)) ? 1 : 0); @@ -586,7 +586,7 @@ static void AndAndEquArray(void) { /* 21 */ int *vResults = getCaliVariable(); int i; - DEBUG_COMMAND("ShArray.AndAndEquArray: %d,%d,%d,%d,%d:\n", vAry, mask, cnt, val, vResults); + DEBUG_COMMAND("ShArray.AndAndEquArray: %d,%d,%d,%d,%d:", vAry, mask, cnt, val, vResults); for (i = 0; i < cnt; i++) { (*vResults) &= (((*vAry & mask) == val) ? 1 : 0); @@ -600,7 +600,7 @@ static void OrEquArray(void) { /* 22 */ int p3 = getCaliValue(); int p4 = getCaliValue(); - DEBUG_COMMAND_YET("ShArray.OrEquArray: %d,%d,%d,%d:\n", p1, p2, p3, p4); + DEBUG_COMMAND_YET("ShArray.OrEquArray: %d,%d,%d,%d:", p1, p2, p3, p4); } static void OrNotArray(void) { /* 23 */ @@ -618,7 +618,7 @@ static void OrNotArray(void) { /* 23 */ int *vResults = getCaliVariable(); int i; - DEBUG_COMMAND("ShArray.OrNotArray %p,%d,%d,%p:\n", vAry, cnt, val, vResults); + DEBUG_COMMAND("ShArray.OrNotArray %p,%d,%d,%p:", vAry, cnt, val, vResults); for (i = 0; i < cnt; i++) { // if (*vAry != val) *vResults = 1; @@ -633,7 +633,7 @@ static void OrLowArray(void) { /* 24 */ int p3 = getCaliValue(); int p4 = getCaliValue(); - DEBUG_COMMAND_YET("ShArray.OrLowArray: %d,%d,%d,%d:\n", p1, p2, p3, p4); + DEBUG_COMMAND_YET("ShArray.OrLowArray: %d,%d,%d,%d:", p1, p2, p3, p4); } static void OrHighArray(void) { /* 25 */ @@ -642,7 +642,7 @@ static void OrHighArray(void) { /* 25 */ int p3 = getCaliValue(); int p4 = getCaliValue(); - DEBUG_COMMAND_YET("ShArray.OrHighArray: %d,%d,%d,%d:\n", p1, p2, p3, p4); + DEBUG_COMMAND_YET("ShArray.OrHighArray: %d,%d,%d,%d:", p1, p2, p3, p4); } static void OrRangeArray(void) { /* 26 */ @@ -652,7 +652,7 @@ static void OrRangeArray(void) { /* 26 */ int p4 = getCaliValue(); int p5 = getCaliValue(); - DEBUG_COMMAND_YET("ShArray.OrRangeArray: %d,%d,%d,%d,%d:\n", p1, p2, p3, p4,p5); + DEBUG_COMMAND_YET("ShArray.OrRangeArray: %d,%d,%d,%d,%d:", p1, p2, p3, p4,p5); } static void OrAndEquArray(void) { /* 27 */ @@ -662,7 +662,7 @@ static void OrAndEquArray(void) { /* 27 */ int p4 = getCaliValue(); int p5 = getCaliValue(); - DEBUG_COMMAND_YET("ShArray.OrAndEquArray: %d,%d,%d,%d,%d:\n", p1, p2, p3, p4,p5); + DEBUG_COMMAND_YET("ShArray.OrAndEquArray: %d,%d,%d,%d,%d:", p1, p2, p3, p4,p5); } static void EnumEquArray(void) { /* 28 */ @@ -680,7 +680,7 @@ static void EnumEquArray(void) { /* 28 */ int *vResult = getCaliVariable(); int i; - DEBUG_COMMAND("ShArray.EnumEquArray %p,%d,%d,%p:\n", vAry, cnt, val, vResult); + DEBUG_COMMAND("ShArray.EnumEquArray %p,%d,%d,%p:", vAry, cnt, val, vResult); *vResult = 0; @@ -698,7 +698,7 @@ static void EnumEquArray2(void) { /* 29 */ int p5 = getCaliValue(); int p6 = getCaliValue(); - DEBUG_COMMAND_YET("ShArray.EnumEquArray2: %d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6); + DEBUG_COMMAND_YET("ShArray.EnumEquArray2: %d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6); } static void EnumEquNotArray2(void) { /* 30 */ @@ -721,7 +721,7 @@ static void EnumEquNotArray2(void) { /* 30 */ int *vResult = getCaliVariable(); int i; - DEBUG_COMMAND("ShArray.EnumEquNotArray2 %p,%p,%d,%d,%d,%p:\n", vAry1, vAry2, cnt, val1, val2, vResult); + DEBUG_COMMAND("ShArray.EnumEquNotArray2 %p,%p,%d,%d,%d,%p:", vAry1, vAry2, cnt, val1, val2, vResult); *vResult = 0; @@ -748,7 +748,7 @@ static void EnumNotArray(void) { /* 31 */ int *vResult = getCaliVariable(); int i; - DEBUG_COMMAND("ShArray.EnumNotArray %p, %d, %d, %p:\n", vAry, cnt, val, vResult); + DEBUG_COMMAND("ShArray.EnumNotArray %p, %d, %d, %p:", vAry, cnt, val, vResult); *vResult = 0; @@ -768,7 +768,7 @@ static void EnumNotArray2(void) { /* 32 */ int p5 = getCaliValue(); int p6 = getCaliValue(); - DEBUG_COMMAND_YET("ShArray.EnumNotArray2: %d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6); + DEBUG_COMMAND_YET("ShArray.EnumNotArray2: %d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6); } static void EnumLowArray(void) { /* 33 */ @@ -777,7 +777,7 @@ static void EnumLowArray(void) { /* 33 */ int p3 = getCaliValue(); int p4 = getCaliValue(); - DEBUG_COMMAND_YET("ShArray.EnumLowArray: %d,%d,%d,%d:\n", p1, p2, p3, p4); + DEBUG_COMMAND_YET("ShArray.EnumLowArray: %d,%d,%d,%d:", p1, p2, p3, p4); } static void EnumHighArray(void) { /* 34 */ @@ -786,7 +786,7 @@ static void EnumHighArray(void) { /* 34 */ int p3 = getCaliValue(); int p4 = getCaliValue(); - DEBUG_COMMAND_YET("ShArray.EnumHighArray: %d,%d,%d,%d:\n", p1, p2, p3, p4); + DEBUG_COMMAND_YET("ShArray.EnumHighArray: %d,%d,%d,%d:", p1, p2, p3, p4); } static void EnumRangeArray(void) { /* 35 */ @@ -806,7 +806,7 @@ static void EnumRangeArray(void) { /* 35 */ int *vResult = getCaliVariable(); int i; - DEBUG_COMMAND("ShArray.EnumRangeArray %d,%d,%d,%d,%d:\n", vAry, cnt, min, max, vResult); + DEBUG_COMMAND("ShArray.EnumRangeArray %d,%d,%d,%d,%d:", vAry, cnt, min, max, vResult); *vResult = 0; @@ -837,7 +837,7 @@ static void GrepEquArray(void) { /* 36 */ int *vResult = getCaliVariable(); int i; - DEBUG_COMMAND("ShArray.GrepEquArray %p,%d,%d,%p,%p:\n", vAry, cnt, val, vMatch, vResult); + DEBUG_COMMAND("ShArray.GrepEquArray %p,%d,%d,%p,%p:", vAry, cnt, val, vMatch, vResult); *vResult = 0; @@ -869,7 +869,7 @@ static void GrepNotArray(void) { /* 37 */ int *vResult = getCaliVariable(); int i; - DEBUG_COMMAND("ShArray.GrepNotArray %p,%d,%d,%p,%p:\n", vAry, cnt, val, vMatch, vResult); + DEBUG_COMMAND("ShArray.GrepNotArray %p,%d,%d,%p,%p:", vAry, cnt, val, vMatch, vResult); *vResult = 0; @@ -892,7 +892,7 @@ static void GrepEquArray2(void) { /* 38 */ int p6 = getCaliValue(); int p7 = getCaliValue(); - DEBUG_COMMAND_YET("ShArray.GrepEquArray2: %d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7); + DEBUG_COMMAND_YET("ShArray.GrepEquArray2: %d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7); } static void GrepNotArray2(void) { /* 39 */ @@ -904,7 +904,7 @@ static void GrepNotArray2(void) { /* 39 */ int p6 = getCaliValue(); int p7 = getCaliValue(); - DEBUG_COMMAND_YET("ShArray.GrepNotArray2: %d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7); + DEBUG_COMMAND_YET("ShArray.GrepNotArray2: %d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7); } static void GrepEquNotArray2(void) { /* 40 */ @@ -916,7 +916,7 @@ static void GrepEquNotArray2(void) { /* 40 */ int p6 = getCaliValue(); int p7 = getCaliValue(); - DEBUG_COMMAND_YET("ShArray.GrepEquNotArray2: %d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6, p7); + DEBUG_COMMAND_YET("ShArray.GrepEquNotArray2: %d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7); } static void GrepLowArray(void) { /* 41 */ @@ -937,7 +937,7 @@ static void GrepLowArray(void) { /* 41 */ int *vResult = getCaliVariable(); int i; - DEBUG_COMMAND("ShArray.GrepLowArray: %p,%d,%d,%p,%p:\n", vAry, cnt, min, vMatch, vResult); + DEBUG_COMMAND("ShArray.GrepLowArray: %p,%d,%d,%p,%p:", vAry, cnt, min, vMatch, vResult); *vResult = 0; @@ -969,7 +969,7 @@ static void GrepHighArray(void) { /* 42 */ int *vResult = getCaliVariable(); int i; - DEBUG_COMMAND("ShArray.GrepHighArray: %p,%d,%d,%p,%p:\n", vAry, cnt, max, vMatch, vResult); + DEBUG_COMMAND("ShArray.GrepHighArray: %p,%d,%d,%p,%p:", vAry, cnt, max, vMatch, vResult); *vResult = 0; @@ -1003,7 +1003,7 @@ static void GrepRangeArray(void) { /* 43 */ int *vResult = getCaliVariable(); int i; - DEBUG_COMMAND("ShArray.GrepRangeArray %p,%d,%d,%d,%p,%p:\n", vAry, cnt, max, min, vMatch, vResult); + DEBUG_COMMAND("ShArray.GrepRangeArray %p,%d,%d,%d,%p,%p:", vAry, cnt, max, min, vMatch, vResult); *vResult = 0; @@ -1040,7 +1040,7 @@ static void GrepLowOrderArray(void) { /* 44 */ int *vResult = getCaliVariable(); int i, j, k = 0; - DEBUG_COMMAND("ShArray.GrepLowOrderArray %p,%d,%d,%d,%p,%p,%p:\n", vAry, cnt, min, max, v1, vLastMatch, vResult); + DEBUG_COMMAND("ShArray.GrepLowOrderArray %p,%d,%d,%d,%p,%p,%p:", vAry, cnt, min, max, v1, vLastMatch, vResult); *vResult = 0; for (i = 0; i < cnt; i++) { @@ -1091,7 +1091,7 @@ static void GrepHighOrderArray(void) { /* 45 */ int *vResult = getCaliVariable(); int i, j, k = 0; - DEBUG_COMMAND("ShArray.GrepHighOrderArray %p,%d,%d,%d,%p,%p,%p:\n", vAry, cnt, min, max, v1, vLastMatch, vResult); + DEBUG_COMMAND("ShArray.GrepHighOrderArray %p,%d,%d,%d,%p,%p,%p:", vAry, cnt, min, max, v1, vLastMatch, vResult); *vResult = 0; for (i = 0; i < cnt; i++) { @@ -1125,7 +1125,7 @@ static void ChangeEquArray(void) { /* 46 */ int dst = getCaliValue(); int i; - DEBUG_COMMAND("ShArray.ChangeEquArray: %d,%d,%d,%d:\n", vAry, cnt, src, dst); + DEBUG_COMMAND("ShArray.ChangeEquArray: %d,%d,%d,%d:", vAry, cnt, src, dst); for (i = 0; i < cnt; i++) { if (*vAry == src) { @@ -1141,7 +1141,7 @@ static void ChangeNotArray(void) { /* 47 */ int p3 = getCaliValue(); int p4 = getCaliValue(); - DEBUG_COMMAND_YET("ShArray.ChangeNotArray: %d,%d,%d,%d:\n", p1, p2, p3, p4); + DEBUG_COMMAND_YET("ShArray.ChangeNotArray: %d,%d,%d,%d:", p1, p2, p3, p4); } static void ChangeLowArray(void) { /* 48 */ @@ -1150,7 +1150,7 @@ static void ChangeLowArray(void) { /* 48 */ int p3 = getCaliValue(); int p4 = getCaliValue(); - DEBUG_COMMAND_YET("ShArray.ChangeLowArray: %d,%d,%d,%d:\n", p1, p2, p3, p4); + DEBUG_COMMAND_YET("ShArray.ChangeLowArray: %d,%d,%d,%d:", p1, p2, p3, p4); } static void ChangeHighArray(void) { /* 49 */ @@ -1159,7 +1159,7 @@ static void ChangeHighArray(void) { /* 49 */ int p3 = getCaliValue(); int p4 = getCaliValue(); - DEBUG_COMMAND_YET("ShArray.ChangeHighArray: %d,%d,%d,%d:\n", p1, p2, p3, p4); + DEBUG_COMMAND_YET("ShArray.ChangeHighArray: %d,%d,%d,%d:", p1, p2, p3, p4); } static void ChangeRangeArray(void) { /* 50 */ @@ -1179,7 +1179,7 @@ static void ChangeRangeArray(void) { /* 50 */ int val = getCaliValue(); int i; - DEBUG_COMMAND("ShArray.ChangeRangeArray %p,%d,%d,%d,%d:\n", vAry, cnt, min, max, val); + DEBUG_COMMAND("ShArray.ChangeRangeArray %p,%d,%d,%d,%d:", vAry, cnt, min, max, val); for (i = 0; i < cnt; i++) { if ((*vAry > min) && (*vAry < max)) { @@ -1212,7 +1212,7 @@ static void CopyArrayToRect(void) { /* 51 */ int dh = getCaliValue(); int x, y; - DEBUG_COMMAND("ShArray.CopyArrayToRect %p,%d,%d,%d,%d,%p,%d,%d:\n", vSrc, sw, sh, sx, sy, vDst, dw, dh); + DEBUG_COMMAND("ShArray.CopyArrayToRect %p,%d,%d,%d,%d,%p,%d,%d:", vSrc, sw, sh, sx, sy, vDst, dw, dh); vSrc += (sy * sw + sx); for (y = 0; y < dh; y++) { @@ -1246,7 +1246,7 @@ static void CopyRectToArray(void) { /* 52 */ int dy = getCaliValue(); int x, y; - DEBUG_COMMAND("ShArray.CopyRectToArray %p,%d,%d,%p,%d,%d,%d,%d:\n", vSrc, sw, sh, vDst, dw, dh, dx, dy); + DEBUG_COMMAND("ShArray.CopyRectToArray %p,%d,%d,%p,%d,%d,%d,%d:", vSrc, sw, sh, vDst, dw, dh, dx, dy); vDst += (dy * dw + dx); for (y = 0; y < sh; y++) { @@ -1272,7 +1272,7 @@ static void ChangeSecretArray(void) { /* 53 */ int *vResult = getCaliVariable(); static WORD key[4] = { 0x7A7A, 0xADAD, 0xBCBC, 0xCECE }; /* key */ - DEBUG_COMMAND("ShArray.ChangeSecretArray %p,%d,%d,%p:\n", vAry, cnt, type, vResult); + DEBUG_COMMAND("ShArray.ChangeSecretArray %p,%d,%d,%p:", vAry, cnt, type, vResult); *vResult = 0; diff --git a/modules/ShCalc/ShCalc.c b/modules/ShCalc/ShCalc.c index 4bade56..0bdf192 100644 --- a/modules/ShCalc/ShCalc.c +++ b/modules/ShCalc/ShCalc.c @@ -62,7 +62,7 @@ static void SetIntNumBase(void) { /* 0 */ numbase = base; - DEBUG_COMMAND("ShCalc.SetIntNumBase %d:\n", base); + DEBUG_COMMAND("ShCalc.SetIntNumBase %d:", base); } @@ -76,13 +76,13 @@ static void SetIntNum16(void) { /* 1 */ l_1000A0D8 = mul64(*var, numbase); - DEBUG_COMMAND("ShCalc.SetIntNum16 %p:\n", var); + DEBUG_COMMAND("ShCalc.SetIntNum16 %p:", var); } static void SetIntNum32(void) { /* 2 */ int p1 = getCaliValue(); - DEBUG_COMMAND_YET("ShCalc.SetIntNum32: %d:\n", p1); + DEBUG_COMMAND_YET("ShCalc.SetIntNum32: %d:", p1); } static void GetIntNum16(void) { /* 3 */ @@ -102,13 +102,13 @@ static void GetIntNum16(void) { /* 3 */ *var = i; - DEBUG_COMMAND("ShCalc.GetIntNum16 %d:\n", var); + DEBUG_COMMAND("ShCalc.GetIntNum16 %d:", var); } static void GetIntNum32(void) { /* 4 */ int p1 = getCaliValue(); - DEBUG_COMMAND_YET("ShCalc.GetIntNum32: %d:\n", p1); + DEBUG_COMMAND_YET("ShCalc.GetIntNum32: %d:", p1); } static void AddIntNum16(void) { /* 5 */ @@ -121,25 +121,25 @@ static void AddIntNum16(void) { /* 5 */ l_1000A0D8 += mul64(*var, numbase); - DEBUG_COMMAND("ShCalc.AddIntNum16 %p:\n", var); + DEBUG_COMMAND("ShCalc.AddIntNum16 %p:", var); } static void AddIntNum32(void) { /* 6 */ int p1 = getCaliValue(); - DEBUG_COMMAND_YET("ShCalc.AddIntNum32: %d:\n", p1); + DEBUG_COMMAND_YET("ShCalc.AddIntNum32: %d:", p1); } static void SubIntNum16(void) { /* 7 */ int p1 = getCaliValue(); - DEBUG_COMMAND_YET("ShCalc.SubIntNum16: %d:\n", p1); + DEBUG_COMMAND_YET("ShCalc.SubIntNum16: %d:", p1); } static void SubIntNum32(void) { /* 8 */ int p1 = getCaliValue(); - DEBUG_COMMAND_YET("ShCalc.SubIntNum32: %d:\n", p1); + DEBUG_COMMAND_YET("ShCalc.SubIntNum32: %d:", p1); } static void MulIntNum16(void) { /* 9 */ @@ -152,13 +152,13 @@ static void MulIntNum16(void) { /* 9 */ l_1000A0D8 *= mul64(*var, numbase); - DEBUG_COMMAND("ShCalc.MulIntNum16: %p:\n", var); + DEBUG_COMMAND("ShCalc.MulIntNum16: %p:", var); } static void MulIntNum32(void) { /* 10 */ int p1 = getCaliValue(); - DEBUG_COMMAND_YET("ShCalc.MulIntNum32: %d:\n", p1); + DEBUG_COMMAND_YET("ShCalc.MulIntNum32: %d:", p1); } static void DivIntNum16(void) { /* 11 */ @@ -175,13 +175,13 @@ static void DivIntNum16(void) { /* 11 */ i = mul64(l_1000A0C8, numbase); l_1000A0D8 = div64(l_1000A0D8, i); - DEBUG_COMMAND("ShCalc.DivIntNum16 %p:\n", var); + DEBUG_COMMAND("ShCalc.DivIntNum16 %p:", var); } static void DivIntNum32(void) { /* 12 */ int p1 = getCaliValue(); - DEBUG_COMMAND_YET("ShCalc.DivIntNum32: %d:\n", p1); + DEBUG_COMMAND_YET("ShCalc.DivIntNum32: %d:", p1); } static void CmpIntNum16(void) { /* 13 */ @@ -189,7 +189,7 @@ static void CmpIntNum16(void) { /* 13 */ int p2 = getCaliValue(); int p3 = getCaliValue(); - DEBUG_COMMAND_YET("ShCalc.CmpIntNum16: %d,%d,%d:\n", p1, p2, p3); + DEBUG_COMMAND_YET("ShCalc.CmpIntNum16: %d,%d,%d:", p1, p2, p3); } static void CmpIntNum32(void) { /* 14 */ @@ -197,7 +197,7 @@ static void CmpIntNum32(void) { /* 14 */ int p2 = getCaliValue(); int p3 = getCaliValue(); - DEBUG_COMMAND_YET("ShCalc.CmpIntNum32: %d,%d,%d:\n", p1, p2, p3); + DEBUG_COMMAND_YET("ShCalc.CmpIntNum32: %d,%d,%d:", p1, p2, p3); } static void GetLengthNum16(void) { /* 15 */ @@ -221,14 +221,14 @@ static void GetLengthNum16(void) { /* 15 */ *vResult = 1; } - DEBUG_COMMAND("ShCalc.GetLengthNum16 %p,%p:\n", var, vResult); + DEBUG_COMMAND("ShCalc.GetLengthNum16 %p,%p:", var, vResult); } static void GetLengthNum32(void) { /* 16 */ int p1 = getCaliValue(); int p2 = getCaliValue(); - DEBUG_COMMAND_YET("ShCalc.GetLengthNum32: %d,%d:\n", p1, p2); + DEBUG_COMMAND_YET("ShCalc.GetLengthNum32: %d,%d:", p1, p2); } static void NumToRate(void) { /* 17 */ @@ -259,7 +259,7 @@ static void NumToRate(void) { /* 17 */ *vResult = i; - DEBUG_COMMAND("ShCalc.NumToRate %d,%d,%d,%d,%p:\n", p1, p2, p3, flag, vResult); + DEBUG_COMMAND("ShCalc.NumToRate %d,%d,%d,%d,%p:", p1, p2, p3, flag, vResult); } @@ -291,7 +291,7 @@ static void NumToRateNum(void) { /* 18 */ *vResult = i; - DEBUG_COMMAND("ShCalc.NumToRateNum %d,%d,%d,%d,%p:\n", p1, p2, p3, flag, vResult); + DEBUG_COMMAND("ShCalc.NumToRateNum %d,%d,%d,%d,%p:", p1, p2, p3, flag, vResult); } static void SetRandomSeed() { @@ -304,7 +304,7 @@ static void SetRandomSeed() { sgenrand(seed); - DEBUG_COMMAND("ShCalc.SetRandomSeed %d:\n", seed); + DEBUG_COMMAND("ShCalc.SetRandomSeed %d:", seed); } static void GetRandomNumA() { @@ -317,7 +317,7 @@ static void GetRandomNumA() { *var = (int)(genrand() * num) + 1; } - DEBUG_COMMAND("ShCalc.GetRandomNumA %d,%p:\n", num, var); + DEBUG_COMMAND("ShCalc.GetRandomNumA %d,%p:", num, var); } static void NumToBit() { @@ -339,7 +339,7 @@ static void NumToBit() { *var = 0; } - DEBUG_COMMAND("ShCalc.NumToBit %d,%p:\n", beki, var); + DEBUG_COMMAND("ShCalc.NumToBit %d,%p:", beki, var); } static void BitToNum() { @@ -358,7 +358,7 @@ static void BitToNum() { int *var = getCaliVariable(); int i; - DEBUG_COMMAND("ShCalc.BitToNum %d,%p:\n", val, var); + DEBUG_COMMAND("ShCalc.BitToNum %d,%p:", val, var); if (val == 0) { *var = 0; diff --git a/modules/ShGraph/ShGraph.c b/modules/ShGraph/ShGraph.c index 81f2254..975fad8 100644 --- a/modules/ShGraph/ShGraph.c +++ b/modules/ShGraph/ShGraph.c @@ -95,13 +95,13 @@ static void Init() { */ int p1 = getCaliValue(); /* ISurface */ - DEBUG_COMMAND("ShGraph.Init %d:\n", p1); + DEBUG_COMMAND("ShGraph.Init %d:", p1); } static void GetSurfaceData() { int p1 = getCaliValue(); /* ISurface */ - DEBUG_COMMAND_YET("ShGraph.GetSurfaceData %d:\n", p1); + DEBUG_COMMAND_YET("ShGraph.GetSurfaceData %d:", p1); } static void ChangeEquColor() { @@ -113,7 +113,7 @@ static void ChangeEquColor() { int *p6 = getCaliVariable(); int p7 = getCaliValue(); /* ISurface */ - DEBUG_COMMAND_YET("ShGraph.ChangeEquColor %d,%d,%d,%d,%p,%p,%d:\n", p1, p2, p3, p4, p5, p6, p7); + DEBUG_COMMAND_YET("ShGraph.ChangeEquColor %d,%d,%d,%d,%p,%p,%d:", p1, p2, p3, p4, p5, p6, p7); } static void ChangeNotColor() { @@ -138,7 +138,7 @@ static void ChangeNotColor() { int x, y; BYTE *dp; - DEBUG_COMMAND("ShGraph.ChangeNotColor %d,%d,%d,%d,%p,%p,%d:\n", x0, y0, width, height, src, dst, p7); + DEBUG_COMMAND("ShGraph.ChangeNotColor %d,%d,%d,%d,%p,%p,%d:", x0, y0, width, height, src, dst, p7); ags_check_param(&x0, &y0, &width, &height); @@ -218,7 +218,7 @@ static void ResetAnimeData() { */ int no = getCaliValue(); - DEBUG_COMMAND("ShGraph.ResetAnimeData %d:\n", no); + DEBUG_COMMAND("ShGraph.ResetAnimeData %d:", no); if (no > 0 && no <= SLOT) { memset(&src[no-1], 0, sizeof(struct animsrc)); @@ -258,7 +258,7 @@ static void SetAnimeSrc() { int *pal = getCaliVariable(); int r, g, b; - DEBUG_COMMAND("ShGraph.SetAnimeSrc %d,%d,%d,%d,%d,%d,%d,%p:\n", no, x0, y0, w, h, uw, uh, pal); + DEBUG_COMMAND("ShGraph.SetAnimeSrc %d,%d,%d,%d,%d,%d,%d,%p:", no, x0, y0, w, h, uw, uh, pal); if (no <= 0 || no > SLOT) return; @@ -298,7 +298,7 @@ static void SetAnimeDst() { int p5 = getCaliValue(); int p6 = getCaliValue(); - DEBUG_COMMAND("ShGraph.SetAnimeDst %d,%p,%p,%d,%d,%d,%d:\n", no, p1, p2, p3, p4, p5, p6); + DEBUG_COMMAND("ShGraph.SetAnimeDst %d,%p,%p,%d,%d,%d,%d:", no, p1, p2, p3, p4, p5, p6); if (no <= 0 || no > SLOT) return; @@ -332,7 +332,7 @@ static void AddAnimeData() { int p6 = getCaliValue(); int i; - DEBUG_COMMAND("ShGraph.AddAnimeData %d,%d,%d,%d,%p,%d:\n", no, p2, p3, p4, p5, p6); + DEBUG_COMMAND("ShGraph.AddAnimeData %d,%d,%d,%d,%p,%d:", no, p2, p3, p4, p5, p6); if (no <= 0 || no > SLOT) return; @@ -366,7 +366,7 @@ static void AddAnimeRemain() { int no = getCaliValue(); int i, _max = 0; - DEBUG_COMMAND("ShGraph.AddAnimeRemain %d:\n", no); + DEBUG_COMMAND("ShGraph.AddAnimeRemain %d:", no); if (no <= 0 || no > SLOT) return; @@ -397,7 +397,7 @@ static void SetAnimeRect() { int w = getCaliValue(); int h = getCaliValue(); - DEBUG_COMMAND("ShGraph.SetAnimeRect %d,%d,%d,%d:\n", x, y, w, h); + DEBUG_COMMAND("ShGraph.SetAnimeRect %d,%d,%d,%d:", x, y, w, h); maprect.x = x; maprect.y = y; @@ -423,7 +423,7 @@ static void SetAnimeBack() { int p5 = getCaliValue(); int p6 = getCaliValue(); - DEBUG_COMMAND("ShGraph.SetAnimeBack %d,%d,%d,%d,%d,%d:\n", sx, sy, w, h, p5, p6); + DEBUG_COMMAND("ShGraph.SetAnimeBack %d,%d,%d,%d,%d,%d:", sx, sy, w, h, p5, p6); mapback.x = sx; mapback.y = sy; @@ -451,7 +451,7 @@ static void PlayAnimeData() { boolean is_backcopied; agsurface_t *dib; - DEBUG_COMMAND("ShGraph.PlayAnimeData %d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p4, p5, p6); + DEBUG_COMMAND("ShGraph.PlayAnimeData %d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6); interval = p2 * 10; diff --git a/modules/ShPort/ShPort.c b/modules/ShPort/ShPort.c index 6b20365..d45c563 100644 --- a/modules/ShPort/ShPort.c +++ b/modules/ShPort/ShPort.c @@ -59,7 +59,7 @@ static void OutputMessageBox(void) { /* 0 */ free(title_utf8); free(msg_utf8); - DEBUG_COMMAND("ShPort.OutputMessageBox: %d,%d,%d,%d,%p,%d:\n", p1, p2, title, msg, res, ISys3xSystem); + DEBUG_COMMAND("ShPort.OutputMessageBox: %d,%d,%d,%d,%p,%d:", p1, p2, title, msg, res, ISys3xSystem); } static void InputListNum(void) { /* 1 */ @@ -87,7 +87,7 @@ static void InputListNum(void) { /* 1 */ } free(ni_param.title); - DEBUG_COMMAND("ShPort.InputListNum: %d,%d,%p,%d,%d,%p,%d:\n", flags, title, val, minval, maxval, res, ISys3xSystem); + DEBUG_COMMAND("ShPort.InputListNum: %d,%d,%p,%d,%d,%p,%d:", flags, title, val, minval, maxval, res, ISys3xSystem); } /** @@ -98,7 +98,7 @@ static void InputListNum(void) { /* 1 */ static void Init(void) { int p1 = getCaliValue(); - DEBUG_COMMAND_YET("ShPort.Init: %d:\n", p1); + DEBUG_COMMAND_YET("ShPort.Init: %d:", p1); } /** @@ -110,7 +110,7 @@ static void InitKeyStatus(void) { int no = getCaliValue(); if (no >= KEYMAP_MAX) { - WARNING("Overflow keymap table(p1)\n", no); + WARNING("Overflow keymap table(p1)", no); return; } @@ -120,7 +120,7 @@ static void InitKeyStatus(void) { memset(keymap[no -1], 0, 256); } - DEBUG_COMMAND("ShPort.InitKeyStatus: %d:\n", no); + DEBUG_COMMAND("ShPort.InitKeyStatus: %d:", no); } /** @@ -136,13 +136,13 @@ static void SetKeyStatus(void) { int func = getCaliValue(); if (no >= KEYMAP_MAX) { - WARNING("Overflow keymap table(p1)\n", no); + WARNING("Overflow keymap table(p1)", no); return; } keymap[no -1][key] = func; - DEBUG_COMMAND("ShPort.SetKeyStatus: %d,%d,%d:\n", no, key, func); + DEBUG_COMMAND("ShPort.SetKeyStatus: %d,%d,%d:", no, key, func); } /** @@ -157,7 +157,7 @@ static void GetKeyStatus(void) { int i; if (no >= KEYMAP_MAX) { - WARNING("Overflow keymap table(p1)\n", no); + WARNING("Overflow keymap table(p1)", no); return; } @@ -166,7 +166,7 @@ static void GetKeyStatus(void) { *var |= (keymap[no -1][i] * RawKeyInfo[i]); } - DEBUG_COMMAND("ShPort.GetKeyStatus: %d,%p:\n", no, var); + DEBUG_COMMAND("ShPort.GetKeyStatus: %d,%p:", no, var); } static void InputListString(void) { @@ -178,7 +178,7 @@ static void InputListString(void) { int p6 = getCaliValue(); int p7 = getCaliValue(); - DEBUG_COMMAND_YET("ShPort.InputListString: %d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p3, p4, p5, p6, p7); + DEBUG_COMMAND_YET("ShPort.InputListString: %d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p3, p4, p5, p6, p7); } static void InputOpenFile(void) { @@ -190,7 +190,7 @@ static void InputOpenFile(void) { int p6 = getCaliValue(); int p7 = getCaliValue(); - DEBUG_COMMAND_YET("ShPort.InputOpenFile: %d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p3, p4, p5, p6, p7); + DEBUG_COMMAND_YET("ShPort.InputOpenFile: %d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p3, p4, p5, p6, p7); } static void InputSaveFile(void) { @@ -202,7 +202,7 @@ static void InputSaveFile(void) { int p6 = getCaliValue(); int p7 = getCaliValue(); - DEBUG_COMMAND_YET("ShPort.InputSaveFile: %d,%d,%d,%d,%d,%d,%d:\n", p1, p2, p3, p3, p4, p5, p6, p7); + DEBUG_COMMAND_YET("ShPort.InputSaveFile: %d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p3, p4, p5, p6, p7); } static const ModuleFunc functions[] = { diff --git a/modules/ShSound/ShSound.c b/modules/ShSound/ShSound.c index 9cc6ade..5584b94 100644 --- a/modules/ShSound/ShSound.c +++ b/modules/ShSound/ShSound.c @@ -48,7 +48,7 @@ static void Init() { */ int p1 = getCaliValue(); /* ISys3x */ - DEBUG_COMMAND("ShSound.Init %d:\n", p1); + DEBUG_COMMAND("ShSound.Init %d:", p1); } static void wavLoad() { @@ -61,7 +61,7 @@ static void wavLoad() { int slot = getCaliValue(); int no = getCaliValue(); - DEBUG_COMMAND("ShSound.wavLoad %d,%d:\n", slot, no); + DEBUG_COMMAND("ShSound.wavLoad %d,%d:", slot, no); mus_wav_load(slot, no); } @@ -76,7 +76,7 @@ static void wavUnload() { mus_wav_unload(slot); - DEBUG_COMMAND("ShSound.wavUnload %d:\n",slot); + DEBUG_COMMAND("ShSound.wavUnload %d:",slot); } static void wavUnloadRange() { @@ -94,7 +94,7 @@ static void wavUnloadRange() { mus_wav_unload(i); } - DEBUG_COMMAND("ShSound.wavUnloadRange %d,%d:\n", slot, range); + DEBUG_COMMAND("ShSound.wavUnloadRange %d,%d:", slot, range); } static void wavUnloadAll() { @@ -107,7 +107,7 @@ static void wavUnloadAll() { mus_wav_unload(i); } - DEBUG_COMMAND("ShSound.wavUnloadAll:\n"); + DEBUG_COMMAND("ShSound.wavUnloadAll:"); } static void wavLoadMemory() { @@ -122,7 +122,7 @@ static void wavLoadMemory() { chunk = pcm_sdlmixer_load(no); #endif - DEBUG_COMMAND("ShSound.wavLoadMemory %d:\n", no); + DEBUG_COMMAND("ShSound.wavLoadMemory %d:", no); } static void wavSendMemory() { @@ -140,7 +140,7 @@ static void wavSendMemory() { } #endif - DEBUG_COMMAND("ShSound.wavSendMemory %d:\n", slot); + DEBUG_COMMAND("ShSound.wavSendMemory %d:", slot); } static void wavFadeVolumeMemory() { @@ -159,7 +159,7 @@ static void wavFadeVolumeMemory() { pcmlib_fade_volume_memory(chunk, start, range); #endif - DEBUG_COMMAND("ShSound.wavFadeVolumeMemory %d,%d:\n", start, range); + DEBUG_COMMAND("ShSound.wavFadeVolumeMemory %d,%d:", start, range); } static void wavReversePanMemory() { @@ -173,7 +173,7 @@ static void wavReversePanMemory() { pcmlib_reverse_pan_memory(chunk); #endif - DEBUG_COMMAND("ShSound.wavReversePanMemory:\n"); + DEBUG_COMMAND("ShSound.wavReversePanMemory:"); } static void wavPlay() { @@ -188,7 +188,7 @@ static void wavPlay() { mus_wav_play(slot, loop == 0 ? 1 : -1); - DEBUG_COMMAND("ShSound.wavPlay %d, %d:\n", slot, loop); + DEBUG_COMMAND("ShSound.wavPlay %d, %d:", slot, loop); } static void wavPlayRing() { @@ -206,7 +206,7 @@ static void wavPlayRing() { mus_wav_play(start + (*cur % cnt), 1); *cur = (*cur + 1) % cnt; - DEBUG_COMMAND("ShSound.wavPlayRing %d,%d,%d:\n", start, cnt, *cur); + DEBUG_COMMAND("ShSound.wavPlayRing %d,%d,%d:", start, cnt, *cur); } static void wavStop() { @@ -217,7 +217,7 @@ static void wavStop() { */ int slot = getCaliValue(); - DEBUG_COMMAND("ShSound.wavStop %d:\n", slot); + DEBUG_COMMAND("ShSound.wavStop %d:", slot); mus_wav_stop(slot); } @@ -232,7 +232,7 @@ static void wavStopAll() { mus_wav_stop(i); } - DEBUG_COMMAND("ShSound.wavStopAll:\n"); + DEBUG_COMMAND("ShSound.wavStopAll:"); } static void wavPause() { @@ -243,7 +243,7 @@ static void wavPause() { */ int slot = getCaliValue(); - DEBUG_COMMAND_YET("ShSound.wavPause %d:\n", slot); + DEBUG_COMMAND_YET("ShSound.wavPause %d:", slot); } static void wavIsPlay() { @@ -258,7 +258,7 @@ static void wavIsPlay() { *result = mus_wav_get_playposition(slot); - DEBUG_COMMAND("ShSound.wavIsPlay %d,%p:\n", slot, result); + DEBUG_COMMAND("ShSound.wavIsPlay %d,%p:", slot, result); } static void wavIsPlayRange() { @@ -280,7 +280,7 @@ static void wavIsPlayRange() { *result = ret; - DEBUG_COMMAND("ShSound.wavIsPlayRange %d,%d,%p:\n", slot, range, result); + DEBUG_COMMAND("ShSound.wavIsPlayRange %d,%d,%p:", slot, range, result); } static const ModuleFunc functions[] = { diff --git a/modules/ShString/ShString.c b/modules/ShString/ShString.c index 26e6783..5aca7b8 100644 --- a/modules/ShString/ShString.c +++ b/modules/ShString/ShString.c @@ -46,35 +46,35 @@ static void ExchangeString(void) { int pat = getCaliValue(); int patr = getCaliValue(); svar_replaceAll(target, pat, patr); - DEBUG_COMMAND("ShString.ExchangeString: %d,%d,%d:\n", target, pat, patr); + DEBUG_COMMAND("ShString.ExchangeString: %d,%d,%d:", target, pat, patr); } static void SetNum16String(void) { /* 1 */ int p1 = getCaliValue(); int p2 = getCaliValue(); - DEBUG_COMMAND_YET("ShString.SetNum16String: %d,%d:\n", p1, p2); + DEBUG_COMMAND_YET("ShString.SetNum16String: %d,%d:", p1, p2); } static void SetNum16HalfString(void) { /* 2 */ int p1 = getCaliValue(); int p2 = getCaliValue(); - DEBUG_COMMAND_YET("ShString.SetNum16HalfString: %d,%d:\n", p1, p2); + DEBUG_COMMAND_YET("ShString.SetNum16HalfString: %d,%d:", p1, p2); } static void SetNum32String(void) { /* 3 */ int p1 = getCaliValue(); int p2 = getCaliValue(); - DEBUG_COMMAND_YET("ShString.SetNum32String: %d,%d:\n", p1, p2); + DEBUG_COMMAND_YET("ShString.SetNum32String: %d,%d:", p1, p2); } static void SetNum32HalfString(void) { /* 4 */ int p1 = getCaliValue(); int p2 = getCaliValue(); - DEBUG_COMMAND_YET("ShString.SetNum32HalfString: %d,%d:\n", p1, p2); + DEBUG_COMMAND_YET("ShString.SetNum32HalfString: %d,%d:", p1, p2); } static void GetArrayString(void) { /* 5 */ @@ -82,7 +82,7 @@ static void GetArrayString(void) { /* 5 */ int p2 = getCaliValue(); int p3 = getCaliValue(); - DEBUG_COMMAND_YET("ShString.GetArrayString: %d,%d,%d:\n", p1, p2, p3); + DEBUG_COMMAND_YET("ShString.GetArrayString: %d,%d,%d:", p1, p2, p3); } static void SetWindowTitle(void) { /* 6 */ @@ -91,7 +91,7 @@ static void SetWindowTitle(void) { /* 6 */ ags_setWindowTitle(svar_get(strno)); - DEBUG_COMMAND("ShString.SetWindowTitle: %d,%d:\n", strno, p2); + DEBUG_COMMAND("ShString.SetWindowTitle: %d,%d:", strno, p2); } static void FillString() { @@ -113,7 +113,7 @@ static void FillString() { svar_set(st + i, svar_get(src)); } - DEBUG_COMMAND("ShString.FillString: %d,%d,%d,%d:\n", st, cnt, src, p4); + DEBUG_COMMAND("ShString.FillString: %d,%d,%d,%d:", st, cnt, src, p4); } static void SetStringNum16(void) { @@ -130,7 +130,7 @@ static void SetStringNum16(void) { char _dst[100]; char *dst = _dst; - DEBUG_COMMAND("ShString.SetStringNum16: %d,%p:\n", st, var); + DEBUG_COMMAND("ShString.SetStringNum16: %d,%p:", st, var); while(*str) { @@ -160,7 +160,7 @@ static void SetStringNum32(void) { int p1 = getCaliValue(); int *p2 = getCaliVariable(); - DEBUG_COMMAND_YET("ShString.SetStringNum32: %d,%p:\n", p1, p2); + DEBUG_COMMAND_YET("ShString.SetStringNum32: %d,%p:", p1, p2); } static const ModuleFunc functions[] = { diff --git a/modules/dDemo/dDemo.c b/modules/dDemo/dDemo.c index 144aaff..337cdf6 100644 --- a/modules/dDemo/dDemo.c +++ b/modules/dDemo/dDemo.c @@ -29,24 +29,24 @@ static void Init() { dd.alk = alk_new("/home/masaki-c/game/daiakuji/dDemo.alk"); #endif - DEBUG_COMMAND_YET("dDemo.Init %d,%d,%d,%p:\n", p1, p2, p3, var); + DEBUG_COMMAND_YET("dDemo.Init %d,%d,%d,%p:", p1, p2, p3, var); } static void SetKeyCancelFlag() { int cancelflag = getCaliValue(); - DEBUG_COMMAND_YET("dDemo.SetKeyCancelFlag %d:\n", cancelflag); + DEBUG_COMMAND_YET("dDemo.SetKeyCancelFlag %d:", cancelflag); } static void SetLoopFlag() { /* Loop Flag */ int loopflag = getCaliValue(); /* 0 なら無限繰り返し */ - DEBUG_COMMAND_YET("dDemo.SetLoopFlag %d:\n", loopflag); + DEBUG_COMMAND_YET("dDemo.SetLoopFlag %d:", loopflag); } static void Run() { - DEBUG_COMMAND_YET("dDemo.Run:\n"); + DEBUG_COMMAND_YET("dDemo.Run:"); #ifdef DDEMODEV mus_cdrom_start(13, 1); diff --git a/modules/eDemo/eDemo.c b/modules/eDemo/eDemo.c index ed02284..7bb1af1 100644 --- a/modules/eDemo/eDemo.c +++ b/modules/eDemo/eDemo.c @@ -17,31 +17,31 @@ static void Init() { *var = 1; - DEBUG_COMMAND_YET("eDEMO.Init %d,%d,%d,%p:\n", p1, p2, p3, var); + DEBUG_COMMAND_YET("eDEMO.Init %d,%d,%d,%p:", p1, p2, p3, var); } static void SetKeyCancelFlag() { int cancelflag = getCaliValue(); - DEBUG_COMMAND_YET("eDEMO.SetKeyCancelFlag %d:\n", cancelflag); + DEBUG_COMMAND_YET("eDEMO.SetKeyCancelFlag %d:", cancelflag); } static void SetLoopFlag() { /* Loop Flag */ int loopflag = getCaliValue(); /* 0 なら無限繰り返し */ - DEBUG_COMMAND_YET("eDEMO.SetLoopFlag %d:\n", loopflag); + DEBUG_COMMAND_YET("eDEMO.SetLoopFlag %d:", loopflag); } static void SetDrawStaffFlag() { /* Loop Flag */ int staffflag = getCaliValue(); - DEBUG_COMMAND_YET("eDEMO.SetDrawStaffFlag %d:\n", staffflag); + DEBUG_COMMAND_YET("eDEMO.SetDrawStaffFlag %d:", staffflag); } static void Run() { - DEBUG_COMMAND_YET("eDEMO.Run:\n"); + DEBUG_COMMAND_YET("eDEMO.Run:"); } static const ModuleFunc functions[] = { diff --git a/modules/eeDemo/eeDemo.c b/modules/eeDemo/eeDemo.c index db40078..37164e9 100644 --- a/modules/eeDemo/eeDemo.c +++ b/modules/eeDemo/eeDemo.c @@ -17,26 +17,26 @@ static void Init() { *var = 1; - DEBUG_COMMAND_YET("eeDEMO.Init %d,%d,%d,%p:\n", p1, p2, p3, var); + DEBUG_COMMAND_YET("eeDEMO.Init %d,%d,%d,%p:", p1, p2, p3, var); } static void SetKeyCancelFlag() { int cancelflag = getCaliValue(); - DEBUG_COMMAND_YET("eeDEMO.SetKeyCancelFlag %d:\n", cancelflag); + DEBUG_COMMAND_YET("eeDEMO.SetKeyCancelFlag %d:", cancelflag); } static void SetLoopFlag() { /* Loop Flag */ int loopflag = getCaliValue(); /* 0 なら無限繰り返し */ - DEBUG_COMMAND_YET("eeDEMO.SetLoopFlag %d:\n", loopflag); + DEBUG_COMMAND_YET("eeDEMO.SetLoopFlag %d:", loopflag); } static void Run() { int p1 = getCaliValue(); - DEBUG_COMMAND_YET("eeDEMO.Run %d:\n", p1); + DEBUG_COMMAND_YET("eeDEMO.Run %d:", p1); } static const ModuleFunc functions[] = { diff --git a/modules/lib/alk.c b/modules/lib/alk.c index 5dee0e1..306205b 100644 --- a/modules/lib/alk.c +++ b/modules/lib/alk.c @@ -37,7 +37,7 @@ alk_t *alk_new(const char *path) { mmap_t *m = map_file(path); if (0 != strncmp(m->addr, "ALK0", 4)) { - WARNING("%s: not an ALK file\n", path); + WARNING("%s: not an ALK file", path); unmap_file(m); return NULL; } diff --git a/modules/lib/cg.c b/modules/lib/cg.c index 6f45fe5..e4726c4 100644 --- a/modules/lib/cg.c +++ b/modules/lib/cg.c @@ -94,7 +94,7 @@ surface_t *sf_getcg(void *b, size_t size) { } if (cg == NULL) { - WARNING("Unknown Cg Type\n"); + WARNING("Unknown Cg Type"); return NULL; } diff --git a/modules/lib/graph.c b/modules/lib/graph.c index 4adc422..43196bf 100644 --- a/modules/lib/graph.c +++ b/modules/lib/graph.c @@ -45,38 +45,38 @@ boolean gr_clip(surface_t *ss, int *sx, int *sy, int *sw, int *sh, surface_t *ds int w, h; if (ss == NULL) { - WARNING("ss surface is null\n"); + WARNING("ss surface is null"); return FALSE; } if (ss == NULL) { - WARNING("ss surface is null\n"); + WARNING("ss surface is null"); return FALSE; } if (*sx > ss->width) { - WARNING("sx is too large (sx=%d,width=%d)\n", *sx, ss->width); + WARNING("sx is too large (sx=%d,width=%d)", *sx, ss->width); return FALSE; } if (*sy > ss->height) { - WARNING("sy is too large (sy=%d,height=%d)\n", *sy, ss->height); + WARNING("sy is too large (sy=%d,height=%d)", *sy, ss->height); return FALSE; } if (*sx < 0) { - WARNING("sx is too small (sx=%d)\n", *sx); + WARNING("sx is too small (sx=%d)", *sx); return FALSE; } if (*sy < 0) { - WARNING("sy is too small (sy=%d)\n", *sy); + WARNING("sy is too small (sy=%d)", *sy); return FALSE; } if (*dx > ds->width) { - WARNING("dx is too large (dx=%d,width=%d)\n", *dx, ds->width); + WARNING("dx is too large (dx=%d,width=%d)", *dx, ds->width); return FALSE; } if (*dy > ds->height) { - WARNING("dy is too large (dy=%d,height=%d)\n", *dy, ds->height); + WARNING("dy is too large (dy=%d,height=%d)", *dy, ds->height); return FALSE; } @@ -94,19 +94,19 @@ boolean gr_clip(surface_t *ss, int *sx, int *sy, int *sw, int *sh, surface_t *ds *sh = min(ss->height - *sy, min(ds->height - *dy, *sh)); if (*sw <= 0) { - WARNING("sw become <=0\n"); + WARNING("sw become <=0"); return FALSE; } if (*sh <= 0) { - WARNING("sh become <=0\n"); + WARNING("sh become <=0"); return FALSE; } if (*sw != w) { - NOTICE("width change %d -> %d\n", w, *sw); + NOTICE("width change %d -> %d", w, *sw); } if (*sh != h) { - NOTICE("height change %d -> %d\n", h, *sh); + NOTICE("height change %d -> %d", h, *sh); } return TRUE; @@ -129,16 +129,16 @@ boolean gr_clip_xywh(surface_t *ss, int *sx, int *sy, int *sw, int *sh) { int w, h; if (ss == NULL) { - WARNING("ss surface is null\n"); + WARNING("ss surface is null"); return FALSE; } if (*sx > ss->width) { - WARNING("sx is too large (sx=%d,width=%d)\n", *sx, ss->width); + WARNING("sx is too large (sx=%d,width=%d)", *sx, ss->width); return FALSE; } if (*sy > ss->height) { - WARNING("sy is too large (sy=%d,height=%d)\n", *sy, ss->height); + WARNING("sy is too large (sy=%d,height=%d)", *sy, ss->height); return FALSE; } @@ -156,19 +156,19 @@ boolean gr_clip_xywh(surface_t *ss, int *sx, int *sy, int *sw, int *sh) { *sh = min(ss->height - *sy, *sh); if (*sw <= 0) { - WARNING("sw become <=0\n"); + WARNING("sw become <=0"); return FALSE; } if (*sh <= 0) { - WARNING("sh become <=0\n"); + WARNING("sh become <=0"); return FALSE; } if (*sw != w) { - NOTICE("width change %d -> %d\n", w, *sw); + NOTICE("width change %d -> %d", w, *sw); } if (*sh != h) { - NOTICE("height change %d -> %d\n", h, *sh); + NOTICE("height change %d -> %d", h, *sh); } return TRUE; diff --git a/modules/lib/graph_blend_amap.c b/modules/lib/graph_blend_amap.c index 44ac691..fe68b4f 100644 --- a/modules/lib/graph_blend_amap.c +++ b/modules/lib/graph_blend_amap.c @@ -14,7 +14,7 @@ int gr_blend_alpha_map(surface_t *dst, int dx, int dy, surface_t *src, int sx, i if (!gr_clip(src, &sx, &sy, &sw, &sh, dst, &dx, &dy)) return NG; if (src->alpha == NULL) { - WARNING("src alpha NULL\n"); + WARNING("src alpha NULL"); return NG; } diff --git a/modules/lib/graph_copy_amap.c b/modules/lib/graph_copy_amap.c index 640c855..58529d9 100644 --- a/modules/lib/graph_copy_amap.c +++ b/modules/lib/graph_copy_amap.c @@ -50,12 +50,12 @@ int gr_copy_alpha_map(surface_t *dst, int dx, int dy, surface_t *src, int sx, in dp = GETOFFSET_ALPHA(dst, dx, dy); if (sp == NULL) { - WARNING("src alpha NULL\n"); + WARNING("src alpha NULL"); return NG; } if (dp == NULL) { - WARNING("dst alpha NULL\n"); + WARNING("dst alpha NULL"); return NG; } diff --git a/modules/lib/graph_saturadd_amap.c b/modules/lib/graph_saturadd_amap.c index 0b57f1e..9e60f41 100644 --- a/modules/lib/graph_saturadd_amap.c +++ b/modules/lib/graph_saturadd_amap.c @@ -17,12 +17,12 @@ int gr_saturadd_alpha_map(surface_t *dst, int dx, int dy, surface_t *src, int sx } if (src->alpha == NULL) { - WARNING("src alpha NULL\n"); + WARNING("src alpha NULL"); return NG; } if (dst->alpha == NULL) { - WARNING("dst alpha NULL\n"); + WARNING("dst alpha NULL"); return NG; } diff --git a/modules/lib/surface.c b/modules/lib/surface.c index 7d35037..4ab240c 100644 --- a/modules/lib/surface.c +++ b/modules/lib/surface.c @@ -37,7 +37,7 @@ static surface_t *create(int width, int height, int depth, boolean has_pixel, bo s->bytes_per_pixel = 4; break; default: - WARNING("depth %d is not supported\n", s->depth); + WARNING("depth %d is not supported", s->depth); } } diff --git a/modules/modules.c b/modules/modules.c index 8ddb973..c302686 100644 --- a/modules/modules.c +++ b/modules/modules.c @@ -65,7 +65,7 @@ static void resolve_func(S39AIN_DLLFN *func, const Module *mod) { if (mf) func->entrypoint = mf->entrypoint; else - WARNING("Cannot resolve DLL function %s.%s\n", mod->name, func->name); + WARNING("Cannot resolve DLL function %s.%s", mod->name, func->name); } int resolve_module(S39AIN_DLLINF *dll) { @@ -80,6 +80,6 @@ int resolve_module(S39AIN_DLLINF *dll) { return OK; } } - WARNING("Cannot resolve DLL: %s\n", dll->name); + WARNING("Cannot resolve DLL: %s", dll->name); return NG; } diff --git a/modules/nDEMO/nDEMO.c b/modules/nDEMO/nDEMO.c index f01814c..6a5395b 100644 --- a/modules/nDEMO/nDEMO.c +++ b/modules/nDEMO/nDEMO.c @@ -16,23 +16,23 @@ static void Init() { *var = 0; - DEBUG_COMMAND_YET("nDEMO.Init %p:\n", var); + DEBUG_COMMAND_YET("nDEMO.Init %p:", var); } static void SetKeyCancelFlag() { int p1 = getCaliValue(); - DEBUG_COMMAND_YET("nDEMO.SetKeyCancelFlag %d:\n", p1); + DEBUG_COMMAND_YET("nDEMO.SetKeyCancelFlag %d:", p1); } static void SetLoopFlag() { int p1 = getCaliValue(); - DEBUG_COMMAND_YET("nDEMO.SetLoopFlag %d:\n", p1); + DEBUG_COMMAND_YET("nDEMO.SetLoopFlag %d:", p1); } static void Run() { - DEBUG_COMMAND_YET("nDEMO.Run:\n"); + DEBUG_COMMAND_YET("nDEMO.Run:"); } static const ModuleFunc functions[] = { diff --git a/modules/nDEMOE/nDEMOE.c b/modules/nDEMOE/nDEMOE.c index 4d01ff3..98d443f 100644 --- a/modules/nDEMOE/nDEMOE.c +++ b/modules/nDEMOE/nDEMOE.c @@ -14,17 +14,17 @@ static void Init() { int p3 = getCaliValue(); int *var = getCaliVariable(); - DEBUG_COMMAND_YET("nDEMOE.Init %p:\n", var); + DEBUG_COMMAND_YET("nDEMOE.Init %p:", var); } static void SetKeyCancelFlag() { int p1 = getCaliValue(); - DEBUG_COMMAND_YET("nDEMOE.SetKeyCancelFlag %d:\n", p1); + DEBUG_COMMAND_YET("nDEMOE.SetKeyCancelFlag %d:", p1); } static void Run() { - DEBUG_COMMAND_YET("nDEMOE.Run:\n"); + DEBUG_COMMAND_YET("nDEMOE.Run:"); } static const ModuleFunc functions[] = { diff --git a/modules/oDEMO/oDEMO.c b/modules/oDEMO/oDEMO.c index 76d6336..97b3e94 100644 --- a/modules/oDEMO/oDEMO.c +++ b/modules/oDEMO/oDEMO.c @@ -17,24 +17,24 @@ static void Init() { *var = 1; - DEBUG_COMMAND_YET("oDEMO.Init %d,%d,%d,%p:\n", p1, p2, p3, var); + DEBUG_COMMAND_YET("oDEMO.Init %d,%d,%d,%p:", p1, p2, p3, var); } static void SetKeyCancelFlag() { int cancelflag = getCaliValue(); - DEBUG_COMMAND_YET("oDEMO.SetKeyCancelFlag %d:\n", cancelflag); + DEBUG_COMMAND_YET("oDEMO.SetKeyCancelFlag %d:", cancelflag); } static void SetLoopFlag() { /* Loop Flag */ int loopflag = getCaliValue(); /* 0 なら無限繰り返し */ - DEBUG_COMMAND_YET("oDEMO.SetLoopFlag %d:\n", loopflag); + DEBUG_COMMAND_YET("oDEMO.SetLoopFlag %d:", loopflag); } static void Run() { - DEBUG_COMMAND_YET("oDEMO.Run:\n"); + DEBUG_COMMAND_YET("oDEMO.Run:"); } static const ModuleFunc functions[] = { diff --git a/modules/oujimisc/oujimisc.c b/modules/oujimisc/oujimisc.c index f578616..d55a2a7 100644 --- a/modules/oujimisc/oujimisc.c +++ b/modules/oujimisc/oujimisc.c @@ -46,7 +46,7 @@ static void MakeMapSetParam() { int p4 = getCaliValue(); if (p1 != NUM_LAYERS) { - WARNING("Unexpected number of layers: %d\n", p1); + WARNING("Unexpected number of layers: %d", p1); return; } setChipParam_index = 0; @@ -54,7 +54,7 @@ static void MakeMapSetParam() { window_height = p3; map_width = p4; - DEBUG_COMMAND("oujimisc.MakeMapSetParam %d,%d,%d,%d:\n", p1,p2,p3,p4); + DEBUG_COMMAND("oujimisc.MakeMapSetParam %d,%d,%d,%d:", p1,p2,p3,p4); } static void MakeMapSetChipParam() { @@ -65,7 +65,7 @@ static void MakeMapSetChipParam() { int p5 = getCaliValue(); if (setChipParam_index >= NUM_LAYERS) { - WARNING("unexpected MakeMapSeChipParam call\n"); + WARNING("unexpected MakeMapSeChipParam call"); return; } MyRectangle *r = &chip_params[setChipParam_index++]; @@ -74,7 +74,7 @@ static void MakeMapSetChipParam() { r->w = p3; r->h = p4; - DEBUG_COMMAND("oujimisc.MakeMapSeChipParam %d,%d,%d,%d,%d:\n", p1,p2,p3,p4,p5); + DEBUG_COMMAND("oujimisc.MakeMapSeChipParam %d,%d,%d,%d,%d:", p1,p2,p3,p4,p5); } static void MakeMapDraw() { @@ -106,13 +106,13 @@ static void MakeMapDraw() { } } - DEBUG_COMMAND("oujimisc.MakeMapDraw %d,%d,%d,%d,%d,%p,%p,%p:\n", p1,dstX,dstY,posX,posY,a1,a2,a3); + DEBUG_COMMAND("oujimisc.MakeMapDraw %d,%d,%d,%d,%d,%p,%p,%p:", p1,dstX,dstY,posX,posY,a1,a2,a3); } static void MakeMapInit() { int p1 = getCaliValue(); /* ISys3x */ - DEBUG_COMMAND_YET("oujimisc.MakeMapInit %d:\n", p1); + DEBUG_COMMAND_YET("oujimisc.MakeMapInit %d:", p1); } static void DrawNumber() { @@ -137,7 +137,7 @@ static void DrawNumber() { dstX += width; } - DEBUG_COMMAND("oujimisc.DrawNumber %d,%d,%d,%d,%d,%d,%d,%d:\n", p1,srcX,srcY,width,height,dstX,dstY,num); + DEBUG_COMMAND("oujimisc.DrawNumber %d,%d,%d,%d,%d,%d,%d,%d:", p1,srcX,srcY,width,height,dstX,dstY,num); } static void TempMapCreateShadow() { @@ -153,14 +153,14 @@ static void TempMapCreateShadow() { ald_freedata(dfile); } - DEBUG_COMMAND("oujimisc.TempMapCreateShadow:\n"); + DEBUG_COMMAND("oujimisc.TempMapCreateShadow:"); } static void TempMapInit() { int p1 = getCaliValue(); /* ISys3x */ int p2 = getCaliValue(); - DEBUG_COMMAND_YET("oujimisc.TempMapInit %d,%d:\n", p1,p2); + DEBUG_COMMAND_YET("oujimisc.TempMapInit %d,%d:", p1,p2); } static void TempMapLoadToShadow() { @@ -171,11 +171,11 @@ static void TempMapLoadToShadow() { int size = getCaliValue(); if (!mapdata[map]) { - WARNING("No map %d\n", map); + WARNING("No map %d", map); return; } if (r1.page == 0 || r2.page == 0 || r3.page == 0) { - WARNING("non-array destination variable\n"); + WARNING("non-array destination variable"); return; } int *a1 = v_resolveRef(&r1); @@ -189,7 +189,7 @@ static void TempMapLoadToShadow() { for (int i = 0; i < size; i++) *a3++ = SDL_SwapLE16(*p++); - DEBUG_COMMAND("oujimisc.TempMapLoadToShadow %d,%p,%p,%p,%d:\n", map,a1,a2,a3,size); + DEBUG_COMMAND("oujimisc.TempMapLoadToShadow %d,%p,%p,%p,%d:", map,a1,a2,a3,size); } static void TempMapSaveToShadow() { @@ -200,11 +200,11 @@ static void TempMapSaveToShadow() { int size = getCaliValue(); if (!mapdata[map]) { - WARNING("No map %d\n", map); + WARNING("No map %d", map); return; } if (r1.page == 0 || r2.page == 0 || r3.page == 0) { - WARNING("non-array source variable\n"); + WARNING("non-array source variable"); return; } int *a1 = v_resolveRef(&r1); @@ -218,7 +218,7 @@ static void TempMapSaveToShadow() { for (int i = 0; i < size; i++) *p++ = SDL_SwapLE16(*a3++); - DEBUG_COMMAND("oujimisc.TempMapSaveToShadow %d,%p,%p,%p,%d:\n", map,a1,a2,a3,size); + DEBUG_COMMAND("oujimisc.TempMapSaveToShadow %d,%p,%p,%p,%d:", map,a1,a2,a3,size); } static void TempMapFileSave() { @@ -228,7 +228,7 @@ static void TempMapFileSave() { sprintf(fname, "王子_M%d.asd", p1); FILE *fp = fc_open(fname, 'w'); if (!fp) { - WARNING("Cannot open %s\n", fname); + WARNING("Cannot open %s", fname); return; } @@ -239,7 +239,7 @@ static void TempMapFileSave() { void *compressed = malloc(size); int r = compress2(compressed, &size, mapdata[i], MAPDATASIZE, Z_BEST_COMPRESSION); if (r != Z_OK) { - WARNING("compress2() failed: %d\n", r); + WARNING("compress2() failed: %d", r); free(compressed); continue; } @@ -250,7 +250,7 @@ static void TempMapFileSave() { } fclose(fp); - DEBUG_COMMAND("oujimisc.TempMapFileSave %d:\n", p1); + DEBUG_COMMAND("oujimisc.TempMapFileSave %d:", p1); } static void TempMapFileLoad() { @@ -260,39 +260,39 @@ static void TempMapFileLoad() { sprintf(fname, "王子_M%d.asd", p1); FILE *fp = fc_open(fname, 'r'); if (!fp) { - WARNING("Cannot open %s\n", fname); + WARNING("Cannot open %s", fname); return; } for (int i = 0; i < NUM_MAPS; i++) { RecordHeader hdr; if (fread(&hdr, sizeof(hdr), 1, fp) != 1) { - WARNING("fread error\n"); + WARNING("fread error"); break; } if (hdr.map != i) { - WARNING("unexpected map no. %d != %d\n", hdr.map, i); + WARNING("unexpected map no. %d != %d", hdr.map, i); break; } if (!mapdata[i]) { - WARNING("map %d is not allocated\n", i); + WARNING("map %d is not allocated", i); break; } void *compressed = malloc(hdr.size); if (fread(compressed, hdr.size, 1, fp) != 1) { - WARNING("fread error\n"); + WARNING("fread error"); free(compressed); break; } unsigned long raw_size = MAPDATASIZE; int r = uncompress(mapdata[i], &raw_size, compressed, hdr.size); if (r != Z_OK) - WARNING("uncompress() failed: %d\n", r); + WARNING("uncompress() failed: %d", r); free(compressed); } fclose(fp); - DEBUG_COMMAND("oujimisc.TempMapFileLoad %d:\n", p1); + DEBUG_COMMAND("oujimisc.TempMapFileLoad %d:", p1); } static void CalcMoveDiffer() { @@ -322,7 +322,7 @@ static void CalcMoveDiffer() { *pt = t >= duration ? 1 : 0; - DEBUG_COMMAND("oujimisc.CalcMoveDiffer %p,%p,%d,%d,%d,%d,%p,%d:\n", dx,dy,moveL,moveU,moveR,moveD,pt,duration); + DEBUG_COMMAND("oujimisc.CalcMoveDiffer %p,%p,%d,%d,%d,%d,%p,%d:", dx,dy,moveL,moveU,moveR,moveD,pt,duration); } static const ModuleFunc functions[] = { diff --git a/modules/tDemo/tDemo.c b/modules/tDemo/tDemo.c index 042453e..2dfe750 100644 --- a/modules/tDemo/tDemo.c +++ b/modules/tDemo/tDemo.c @@ -16,24 +16,24 @@ static void Init() { *var = 1; - DEBUG_COMMAND_YET("tDemo.Init %d,%d,%d,%p:\n", p1, p2, p3, var); + DEBUG_COMMAND_YET("tDemo.Init %d,%d,%d,%p:", p1, p2, p3, var); } static void SetKeyCancelFlag() { int cancelflag = getCaliValue(); - DEBUG_COMMAND_YET("tDemo.SetKeyCancelFlag %d:\n", cancelflag); + DEBUG_COMMAND_YET("tDemo.SetKeyCancelFlag %d:", cancelflag); } static void SetLoopFlag() { /* Loop Flag */ int loopflag = getCaliValue(); /* 0 なら無限繰り返し */ - DEBUG_COMMAND_YET("tDemo.SetLoopFlag %d:\n", loopflag); + DEBUG_COMMAND_YET("tDemo.SetLoopFlag %d:", loopflag); } static void Run() { - DEBUG_COMMAND_YET("tDemo.Run:\n"); + DEBUG_COMMAND_YET("tDemo.Run:"); } static const ModuleFunc functions[] = { diff --git a/src/ags.c b/src/ags.c index 4220c55..290428a 100644 --- a/src/ags.c +++ b/src/ags.c @@ -63,11 +63,11 @@ static void initPal(Palette256 *pal) { boolean ags_check_param(int *x, int *y, int *w, int *h) { if (*x >= nact->ags.world_size.width) { - WARNING("Illegal Param x = %d (max=%d)(@%03x:%05x)\n", *x, nact->ags.world_size.width, sl_getPage(), sl_getIndex()); + WARNING("Illegal Param x = %d (max=%d)(@%03x:%05x)", *x, nact->ags.world_size.width, sl_getPage(), sl_getIndex()); return FALSE; } if (*y >= nact->ags.world_size.height) { - WARNING("Illegal Param y = %d (max=%d)\n", *y, nact->ags.world_size.height); + WARNING("Illegal Param y = %d (max=%d)", *y, nact->ags.world_size.height); return FALSE; } @@ -85,11 +85,11 @@ boolean ags_check_param(int *x, int *y, int *w, int *h) { boolean ags_check_param_xy(int *x, int *y) { if (*x >= nact->ags.world_size.width) { - WARNING("Illegal Param x = %d\n", *x); + WARNING("Illegal Param x = %d", *x); return FALSE; } if (*y >= nact->ags.world_size.height) { - WARNING("Illegal Param y = %d\n", *y); + WARNING("Illegal Param y = %d", *y); return FALSE; } diff --git a/src/bgi.c b/src/bgi.c index 9f2162b..12e8d52 100644 --- a/src/bgi.c +++ b/src/bgi.c @@ -54,7 +54,7 @@ int bgi_read(const char *path) { FILE *fp = fopen(path, "rb"); if (!fp) { - WARNING("Could not open %s\n", path); + WARNING("Could not open %s", path); return NG; } diff --git a/src/bgm.sdlmixer.c b/src/bgm.sdlmixer.c index c35fcbd..82ddf8b 100644 --- a/src/bgm.sdlmixer.c +++ b/src/bgm.sdlmixer.c @@ -58,7 +58,7 @@ static Mix_Music *bgm_load(int no) { dfile = ald_getdata(DRIFILE_BGM, no -1); if (dfile == NULL) { - WARNING("DRIFILE_BGM fail to open %d\n", no -1); + WARNING("DRIFILE_BGM fail to open %d", no -1); return NULL; } @@ -66,7 +66,7 @@ static Mix_Music *bgm_load(int no) { mix_music = Mix_LoadMUS_RW(rwops, SDL_TRUE /* freesrc */); if (mix_music == NULL) { - WARNING("Failed to load BGM %d: %s\n", no, SDL_GetError()); + WARNING("Failed to load BGM %d: %s", no, SDL_GetError()); free_music(); return NULL; } diff --git a/src/cali.c b/src/cali.c index 3a92507..260b4c8 100644 --- a/src/cali.c +++ b/src/cali.c @@ -64,7 +64,7 @@ static int *getVar(int c0, struct VarRef *ref) { int index = getCaliValue(); int *store = v_ref_indexed(var, index, ref); if (!store) - WARNING("%03d:%05x: Out of bounds index access: %s[%d]\n", sl_getPage(), addr, v_name(var), index); + WARNING("%03d:%05x: Out of bounds index access: %s[%d]", sl_getPage(), addr, v_name(var), index); return store; } else if (c1 >= 0x40) { var = c1; // 0x40 - 0xff @@ -75,7 +75,7 @@ static int *getVar(int c0, struct VarRef *ref) { } int *store = v_ref(var, ref); if (!store) - WARNING("%03d:%05x: Out of bounds array access: %s\n", sl_getPage(), addr, v_name(var)); + WARNING("%03d:%05x: Out of bounds array access: %s", sl_getPage(), addr, v_name(var)); return store; } @@ -247,7 +247,7 @@ int getCaliValue(void) { c0 = *--cali; if (cali != bufc) { - WARNING("Something is wrong @ %03d:%05x\n", sl_getPage(), sl_getIndex()); + WARNING("Something is wrong @ %03d:%05x", sl_getPage(), sl_getIndex()); cali = bufc; return 0; } diff --git a/src/cdrom.c b/src/cdrom.c index 4a0a37f..37c2c88 100644 --- a/src/cdrom.c +++ b/src/cdrom.c @@ -99,7 +99,7 @@ int cd_init(cdromdevice_t *cd) { ret = cd->init(dev); #else /* error */ - WARNING("no cdrom device available\n"); + WARNING("no cdrom device available"); ret = NG; #endif } diff --git a/src/cdrom.mp3.c b/src/cdrom.mp3.c index 9ec010f..7fba95e 100644 --- a/src/cdrom.mp3.c +++ b/src/cdrom.mp3.c @@ -72,7 +72,7 @@ static int cdrom_init(char *playlist_path) { fp = fopen("_inmm.ini", "r"); } if (!fp) { - NOTICE("cdrom: Cannot open playlist %s\n", playlist_path); + NOTICE("cdrom: Cannot open playlist %s", playlist_path); return NG; } @@ -93,7 +93,7 @@ static int cdrom_init(char *playlist_path) { } } fclose(fp); - NOTICE("cdrom: Loaded playlist from %s\n", playlist_path); + NOTICE("cdrom: Loaded playlist from %s", playlist_path); trackno = 0; enabled = TRUE; @@ -135,7 +135,7 @@ static int cdrom_start(int trk, int loop) { #endif if (!mix_music) { - WARNING("Cannot load %s: %s\n", playlist[trk], Mix_GetError()); + WARNING("Cannot load %s: %s", playlist[trk], Mix_GetError()); return NG; } if (Mix_PlayMusic(mix_music, loop == 0 ? -1 : loop) != 0) { diff --git a/src/cg.c b/src/cg.c index 101f3ed..d1f3b60 100644 --- a/src/cg.c +++ b/src/cg.c @@ -88,7 +88,7 @@ static CG_TYPE check_cgformat(BYTE *data) { } else if (jpeg_checkfmt(data) && nact->ags.world_depth >= 15) { return ALCG_JPEG; } - WARNING("Unknown Cg Type\n"); + WARNING("Unknown Cg Type"); return ALCG_UNKNOWN; } @@ -364,7 +364,7 @@ void cg_load_with_alpha(int cgno, int shadowno) { if (cgno >= 0) { if (NULL == (cg = loader(cgno))) return; if (cg->type != ALCG_PMS16) { - WARNING("commandGX cg_no != 16bitPMS\n"); + WARNING("commandGX cg_no != 16bitPMS"); return; } } @@ -372,7 +372,7 @@ void cg_load_with_alpha(int cgno, int shadowno) { /* load alpha pixel */ if (NULL == (scg = loader(shadowno))) return; if (scg->type != ALCG_PMS8) { - WARNING("commandGX shadow_no != 8bitPMS\n"); + WARNING("commandGX shadow_no != 8bitPMS"); return; } diff --git a/src/cmd2F.c b/src/cmd2F.c index a44e065..21580c8 100644 --- a/src/cmd2F.c +++ b/src/cmd2F.c @@ -79,7 +79,7 @@ void commands2F00() { } } - DEBUG_COMMAND("TOC:\n"); + DEBUG_COMMAND("TOC:"); } void commands2F01() { @@ -95,7 +95,7 @@ void commands2F01() { } } - DEBUG_COMMAND("TOS:\n"); + DEBUG_COMMAND("TOS:"); } void commands2F02() { @@ -107,7 +107,7 @@ void commands2F02() { data[2] = (exp == 0 ? nact->msg.MsgFontColor : nact->sel.MsgFontColor); sl_pushData(data, 3); - DEBUG_COMMAND("TPC %d\n", exp); + DEBUG_COMMAND("TPC %d", exp); } void commands2F03() { @@ -119,7 +119,7 @@ void commands2F03() { data[2] = (exp == 0 ? nact->msg.MsgFontSize : nact->sel.MsgFontSize); sl_pushData(data, 3); - DEBUG_COMMAND("TPS %d:%s\n", exp, ""); + DEBUG_COMMAND("TPS %d:%s", exp, ""); } void commands2F04() { @@ -131,7 +131,7 @@ void commands2F04() { msg_setMessageLocation(data[1], data[2]); } - DEBUG_COMMAND("TOP:\n"); + DEBUG_COMMAND("TOP:"); } void commands2F05() { @@ -144,7 +144,7 @@ void commands2F05() { data[2] = loc.y; sl_pushData(data, 3); - DEBUG_COMMAND("TPP:\n"); + DEBUG_COMMAND("TPP:"); } void commands2F08() { @@ -153,7 +153,7 @@ void commands2F08() { ags_setAntialiasedStringMode(exp == 1); - DEBUG_COMMAND("TAA %d:\n", exp); + DEBUG_COMMAND("TAA %d:", exp); } void commands2F09() { @@ -162,7 +162,7 @@ void commands2F09() { *var = ags_getAntialiasedStringMode() ? 1 : 0; - DEBUG_COMMAND("TAB %d:\n", *var); + DEBUG_COMMAND("TAB %d:", *var); } void commands2F0A() { @@ -172,7 +172,7 @@ void commands2F0A() { mus_wav_load(eCh, eLinkNum); - DEBUG_COMMAND("wavLoad %d, %d:\n", eCh, eLinkNum); + DEBUG_COMMAND("wavLoad %d, %d:", eCh, eLinkNum); } void commands2F0B() { @@ -182,7 +182,7 @@ void commands2F0B() { mus_wav_play(eCh, eLoopFlag); - DEBUG_COMMAND("wavPlay %d, %d\n", eCh, eLoopFlag); + DEBUG_COMMAND("wavPlay %d, %d", eCh, eLoopFlag); } void commands2F0C() { @@ -190,7 +190,7 @@ void commands2F0C() { mus_wav_stop(eCh); - DEBUG_COMMAND("wavStop %d\n", eCh); + DEBUG_COMMAND("wavStop %d", eCh); } void commands2F0D() { @@ -198,7 +198,7 @@ void commands2F0D() { mus_wav_unload(eCh); - DEBUG_COMMAND("wavUnload %d:\n", eCh); + DEBUG_COMMAND("wavUnload %d:", eCh); } void commands2F0E() { @@ -208,7 +208,7 @@ void commands2F0E() { *vResult = ((pos == 0 || pos == 65535) ? 0 : 1); - DEBUG_COMMAND("wavIsPlay %d, %d:\n", eCh, *vResult); + DEBUG_COMMAND("wavIsPlay %d, %d:", eCh, *vResult); } void commands2F0F() { @@ -219,7 +219,7 @@ void commands2F0F() { mus_wav_fadeout_start(eCh, eTime, eVolume, eStopFlag); - DEBUG_COMMAND("wavFade %d, %d, %d, %d:\n", eCh, eTime, eVolume, eStopFlag); + DEBUG_COMMAND("wavFade %d, %d, %d, %d:", eCh, eTime, eVolume, eStopFlag); } void commands2F10() { @@ -228,7 +228,7 @@ void commands2F10() { *vResult = (mus_wav_fadeout_get_state(eCh) ? 1 : 0); - DEBUG_COMMAND("wavIsFade %d, %d:\n", eCh, *vResult); + DEBUG_COMMAND("wavIsFade %d, %d:", eCh, *vResult); } void commands2F11() { @@ -236,13 +236,13 @@ void commands2F11() { mus_wav_fadeout_stop(eCh); - DEBUG_COMMAND("wavStopFade %d:\n", eCh); + DEBUG_COMMAND("wavStopFade %d:", eCh); } void commands2F12() { const char *sText = sl_getString(0); - DEBUG_COMMAND("trace %s:\n", sText); + DEBUG_COMMAND("trace %s:", sText); } @@ -252,11 +252,11 @@ void commands2F13() { int eY = getCaliValue(); int eZ = getCaliValue(); - DEBUG_COMMAND_YET("wav3DSetPos %d, %d, %d, %d:\n", eCh, eX, eY, eZ); + DEBUG_COMMAND_YET("wav3DSetPos %d, %d, %d, %d:", eCh, eX, eY, eZ); } void commands2F14() { - DEBUG_COMMAND_YET("wav3DCommit:\n"); + DEBUG_COMMAND_YET("wav3DCommit:"); } void commands2F15() { @@ -268,7 +268,7 @@ void commands2F15() { *eX = 0; *eY = 0; *eZ = 0; - DEBUG_COMMAND_YET("wav3DGetPos %d, %d, %d, %d:\n", eCh, *eX, *eY, *eZ); + DEBUG_COMMAND_YET("wav3DGetPos %d, %d, %d, %d:", eCh, *eX, *eY, *eZ); } void commands2F16() { @@ -276,7 +276,7 @@ void commands2F16() { int eY = getCaliValue(); int eZ = getCaliValue(); - DEBUG_COMMAND_YET("wav3DSetPosL %d, %d, %d:\n", eX, eY, eZ); + DEBUG_COMMAND_YET("wav3DSetPosL %d, %d, %d:", eX, eY, eZ); } void commands2F17() { @@ -287,7 +287,7 @@ void commands2F17() { *vX = 0; *vY = 0; *vZ = 0; - DEBUG_COMMAND_YET("wav3DGetPosL %d, %d, %d:%s\n", *vX, *vY, *vZ); + DEBUG_COMMAND_YET("wav3DGetPosL %d, %d, %d:%s", *vX, *vY, *vZ); } void commands2F18() { @@ -297,7 +297,7 @@ void commands2F18() { int eY = getCaliValue(); int eZ = getCaliValue(); - DEBUG_COMMAND_YET("wav3DFadePos %d, %d, %d, %d, %d:\n", eCh, eTime, eX, eY, eZ); + DEBUG_COMMAND_YET("wav3DFadePos %d, %d, %d, %d, %d:", eCh, eTime, eX, eY, eZ); } void commands2F19() { @@ -305,13 +305,13 @@ void commands2F19() { int *vResult = getCaliVariable(); *vResult = 0; - DEBUG_COMMAND_YET("wav3DIsFadePos %d, %d:\n", eCh, *vResult); + DEBUG_COMMAND_YET("wav3DIsFadePos %d, %d:", eCh, *vResult); } void commands2F1A() { int eCh = getCaliValue(); - DEBUG_COMMAND_YET("wav3DStopFadePos %d:\n", eCh); + DEBUG_COMMAND_YET("wav3DStopFadePos %d:", eCh); } void commands2F1B() { @@ -320,14 +320,14 @@ void commands2F1B() { int eY = getCaliValue(); int eZ = getCaliValue(); - DEBUG_COMMAND_YET("wav3DFadePosL %d, %d, %d, %d:\n", eTime, eX, eY, eZ); + DEBUG_COMMAND_YET("wav3DFadePosL %d, %d, %d, %d:", eTime, eX, eY, eZ); } void commands2F1C() { int *vResult = getCaliVariable(); *vResult = 0; - DEBUG_COMMAND_YET("wav3DIsFadePosL %d:\n", *vResult); + DEBUG_COMMAND_YET("wav3DIsFadePosL %d:", *vResult); } void commands2F1D() { @@ -342,13 +342,13 @@ void commands2F1E() { mus_pcm_start(eLinkNum , eLoop); } - DEBUG_COMMAND("sndPlay %d, %d:\n", eLinkNum, eLoop); + DEBUG_COMMAND("sndPlay %d, %d:", eLinkNum, eLoop); } void commands2F1F() { mus_pcm_stop(0); - DEBUG_COMMAND("sndStop:\n"); + DEBUG_COMMAND("sndStop:"); } void commands2F20() { @@ -356,7 +356,7 @@ void commands2F20() { mus_pcm_get_playposition(vResult); - DEBUG_COMMAND("sndIsPlay %d:\n", *vResult); + DEBUG_COMMAND("sndIsPlay %d:", *vResult); } void commands2F21() { @@ -374,7 +374,7 @@ void commands2F23() { sysVar[0] = cg_load_with_filename(fname_utf8, x, y); free(fname_utf8); - DEBUG_COMMAND("LC(new) %d, %d, %s:\n", x, y, vFileName); + DEBUG_COMMAND("LC(new) %d, %d, %s:", x, y, vFileName); } void commands2F24() { @@ -399,12 +399,12 @@ void commands2F24() { default: var = getCaliValue(); cnt = getCaliValue(); - WARNING("Unknown LE command type %d\n", type); + WARNING("Unknown LE command type %d", type); break; } free(fname_utf8); - DEBUG_COMMAND("LE(new) %d, %s, %d, %d:\n", type, file_name, var, cnt); + DEBUG_COMMAND("LE(new) %d, %s, %d, %d:", type, file_name, var, cnt); } void commands2F25() { @@ -412,7 +412,7 @@ void commands2F25() { const char *title = sl_getString(0); const char *filter = sl_getString(0); - DEBUG_COMMAND_YET("LXG %d, %s, %s:\n", file_name, title, filter); + DEBUG_COMMAND_YET("LXG %d, %s, %s:", file_name, title, filter); } void commands2F26() { @@ -443,7 +443,7 @@ void commands2F26() { free(t2); free(t3); - DEBUG_COMMAND("MI(new) %d, %d, %s:\n", dst_no, max_len, title); + DEBUG_COMMAND("MI(new) %d, %d, %s:", dst_no, max_len, title); } void commands2F27() { @@ -451,7 +451,7 @@ void commands2F27() { const char *string = sl_getString(0); svar_set(num, string); - DEBUG_COMMAND("MS(new) %d, %s:\n", num, string); + DEBUG_COMMAND("MS(new) %d, %s:", num, string); } void commands2F28() { @@ -468,7 +468,7 @@ void commands2F28() { have_eng_mp_patch = TRUE; } - DEBUG_COMMAND("MT(new) %s:\n",title); + DEBUG_COMMAND("MT(new) %s:",title); } /* defined in cmdn.c */ @@ -483,7 +483,7 @@ void commands2F29() { t = toUTF8(title); ni_param.title = t; - DEBUG_COMMAND("NT(new) %s:\n", title); + DEBUG_COMMAND("NT(new) %s:", title); } void commands2F2A() { @@ -508,12 +508,12 @@ void commands2F2A() { default: var = getCaliValue(); cnt = getCaliValue(); - WARNING("Unknown QE command\n"); + WARNING("Unknown QE command"); break; } free(fname_utf8); - DEBUG_COMMAND("QE(new) %d, %s, %d, %d:\n", type, file_name, var, cnt); + DEBUG_COMMAND("QE(new) %d, %s, %d, %d:", type, file_name, var, cnt); } void commands2F2B() { @@ -521,7 +521,7 @@ void commands2F2B() { const char *work_dir = sl_getString(0); const char *file_name = sl_getString(0); - DEBUG_COMMAND_YET("UP(new) %d, %s, %s:\n", type, work_dir, file_name); + DEBUG_COMMAND_YET("UP(new) %d, %s, %s:", type, work_dir, file_name); } void commands2F2D() { @@ -531,7 +531,7 @@ void commands2F2D() { /* 該当する eCh が演奏中の場合 eTime だけ wait をいれる */ mus_wav_waittime(eCh, eTime); - DEBUG_COMMAND("wavWaitTime %d, %d:\n", eCh, eTime); + DEBUG_COMMAND("wavWaitTime %d, %d:", eCh, eTime); } void commands2F2E() { @@ -540,7 +540,7 @@ void commands2F2E() { *vTime = mus_wav_get_playposition(eCh); - DEBUG_COMMAND("wavGetPlayPos %d, %d:\n", eCh, *vTime); + DEBUG_COMMAND("wavGetPlayPos %d, %d:", eCh, *vTime); } void commands2F2F() { @@ -550,7 +550,7 @@ void commands2F2F() { /* ただし、無限ループの場合は１回目終了時まで */ mus_wav_waitend(eCh); - DEBUG_COMMAND("wavWaitEnd %d:\n", eCh); + DEBUG_COMMAND("wavWaitEnd %d:", eCh); } void commands2F30() { @@ -559,7 +559,7 @@ void commands2F30() { *vTime = mus_wav_wavtime(eCh); - DEBUG_COMMAND("wavGetWavTime %d, %d:\n", eCh, *vTime); + DEBUG_COMMAND("wavGetWavTime %d, %d:", eCh, *vTime); } void commands2F31() { @@ -567,7 +567,7 @@ void commands2F31() { int fIndex = sl_getaddr(); sel_setCallback(1, fPage, fIndex); - DEBUG_COMMAND("menuSetCbkSelect page=%d, index=%x:\n", fPage, fIndex); + DEBUG_COMMAND("menuSetCbkSelect page=%d, index=%x:", fPage, fIndex); } void commands2F32() { @@ -575,24 +575,24 @@ void commands2F32() { int fIndex = sl_getaddr(); sel_setCallback(2, fPage, fIndex); - DEBUG_COMMAND("menuSetCbkCancel page=%d, index=%x:\n", fPage, fIndex); + DEBUG_COMMAND("menuSetCbkCancel page=%d, index=%x:", fPage, fIndex); } void commands2F33() { sel_setCallback(1, 0, 0); - DEBUG_COMMAND("menuClearCbkSelect:\n"); + DEBUG_COMMAND("menuClearCbkSelect:"); } void commands2F34() { sel_setCallback(2, 0, 0); - DEBUG_COMMAND("menuClearCbkCancel:\n"); + DEBUG_COMMAND("menuClearCbkCancel:"); } void commands2F35() { int eCh = getCaliValue(); int eMode = getCaliValue(); - DEBUG_COMMAND_YET("wav3DSetMode %d, %d:\n", eCh, eMode); + DEBUG_COMMAND_YET("wav3DSetMode %d, %d:", eCh, eMode); } void commands2F36() { @@ -610,7 +610,7 @@ void commands2F36() { eDestX, eDestY, eDestWidth, eDestHeight, 0); ags_updateArea(eDestX, eDestY, eDestWidth, eDestHeight); - DEBUG_COMMAND("grCopyStrerch %d, %d, %d, %d, %d, %d, %d, %d, %d:\n", + DEBUG_COMMAND("grCopyStrerch %d, %d, %d, %d, %d, %d, %d, %d, %d:", eDestX, eDestY, eDestWidth, eDestHeight, eSrcX, eSrcY, eSrcWidth, eSrcHeight, eMode); } @@ -622,13 +622,13 @@ void commands2F37() { int eHeight = getCaliValue(); int eType = getCaliValue(); - DEBUG_COMMAND_YET("grFilterRect %d, %d, %d, %d, %d:\n", + DEBUG_COMMAND_YET("grFilterRect %d, %d, %d, %d, %d:", eX, eY, eWidth, eHeight, eType); } void commands2F38() { sys_clearWheelInfo(); - DEBUG_COMMAND("iptClearWheelCount:\n"); + DEBUG_COMMAND("iptClearWheelCount:"); } void commands2F39() { @@ -636,21 +636,21 @@ void commands2F39() { int *vBack = getCaliVariable(); sys_getWheelInfo(vForward, vBack); - DEBUG_COMMAND("iptGetWheelCount %d, %d:\n", *vForward, *vBack); + DEBUG_COMMAND("iptGetWheelCount %d, %d:", *vForward, *vBack); } void commands2F3A() { int *vSize = getCaliVariable(); *vSize = nact->sel.MsgFontSize; - DEBUG_COMMAND("menuGetFontSize %d:\n", *vSize); + DEBUG_COMMAND("menuGetFontSize %d:", *vSize); } void commands2F3B() { int *vSize = getCaliVariable(); *vSize = nact->msg.MsgFontSize; - DEBUG_COMMAND("msgGetFontSize %d:\n", *vSize); + DEBUG_COMMAND("msgGetFontSize %d:", *vSize); } void commands2F3C() { @@ -660,7 +660,7 @@ void commands2F3C() { *vResult = svar_getCharType(eNum, ePos); - DEBUG_COMMAND("strGetCharType %d, %d, %d:\n", eNum, ePos, *vResult); + DEBUG_COMMAND("strGetCharType %d, %d, %d:", eNum, ePos, *vResult); } void commands2F3D() { @@ -669,17 +669,17 @@ void commands2F3D() { *vResult = svar_width(eNum); - DEBUG_COMMAND("strGetLengthASCII %d, %d:\n", eNum, *vResult); + DEBUG_COMMAND("strGetLengthASCII %d, %d:", eNum, *vResult); } void commands2F3E() { // no-op - DEBUG_COMMAND("sysWinMsgLock:\n"); + DEBUG_COMMAND("sysWinMsgLock:"); } void commands2F3F() { // no-op - DEBUG_COMMAND("sysWinMsgUnlock:\n"); + DEBUG_COMMAND("sysWinMsgUnlock:"); } void commands2F40() { @@ -689,7 +689,7 @@ void commands2F40() { int *vResult = getCaliVariable(); int cnt = 0; - DEBUG_COMMAND("aryCmpCount %d, %d, %d, %d:\n", *vAry, eCount, eNum, *vResult); + DEBUG_COMMAND("aryCmpCount %d, %d, %d, %d:", *vAry, eCount, eNum, *vResult); while(eCount--) { if (*vAry == eNum) cnt++; @@ -707,7 +707,7 @@ void commands2F41() { int *vResult = getCaliVariable(); int cnt = 0; - DEBUG_COMMAND("aryCmpTrans %d, %d, %d, %d, %d, %d:\n", + DEBUG_COMMAND("aryCmpTrans %d, %d, %d, %d, %d, %d:", *vAry, eNumof, eNum, eTransNum, eMaxTrans, *vResult); while(eNumof--) { @@ -732,7 +732,7 @@ void commands2F42() { int eSrcRate = getCaliValue(); int eType = getCaliValue(); - DEBUG_COMMAND_YET("grBlendColorRect %d, %d, %d, %d, %d, %d, %d, %d, %d:\n", + DEBUG_COMMAND_YET("grBlendColorRect %d, %d, %d, %d, %d, %d, %d, %d, %d:", eDestX, eDestY, eWidth, eHeight, eDestRate, eSrcX, eSrcY, eSrcRate, eType); } @@ -746,7 +746,7 @@ void commands2F43() { sdl_fillCircle(eX, eY, eLength, eColor); ags_updateArea(eX, eY, eLength, eLength); - DEBUG_COMMAND("grDrawFillCircle %d, %d, %d, %d:\n", eX, eY, eLength, eColor); + DEBUG_COMMAND("grDrawFillCircle %d, %d, %d, %d:", eX, eY, eLength, eColor); } void commands2F44() { @@ -757,7 +757,7 @@ void commands2F44() { svar_set(num1, format_number(num2, fig, buf)); - DEBUG_COMMAND("MHH %d, %d, %d:\n", num1, fig, num2); + DEBUG_COMMAND("MHH %d, %d, %d:", num1, fig, num2); } void commands2F45() { @@ -767,12 +767,12 @@ void commands2F45() { cb_sel_init_page = fPage; cb_sel_init_address = fIndex; - DEBUG_COMMAND("menuSetCbkInit page=%d, index=%x:\n", fPage, fIndex); + DEBUG_COMMAND("menuSetCbkInit page=%d, index=%x:", fPage, fIndex); } void commands2F46() { cb_sel_init_page = 0; - DEBUG_COMMAND("menuClearCbkInit:\n"); + DEBUG_COMMAND("menuClearCbkInit:"); } void commands2F47() { @@ -780,34 +780,34 @@ void commands2F47() { sl_jmpNear(sl_getIndex()); sl_callFar2(cb_sel_init_page -1, cb_sel_init_address); } - DEBUG_COMMAND("new ]:\n"); + DEBUG_COMMAND("new ]:"); } void commands2F48() { const char *sText = sl_getString(0); - DEBUG_COMMAND_YET("sysOpenShell %s:\n", sText); + DEBUG_COMMAND_YET("sysOpenShell %s:", sText); } void commands2F49() { const char *sTitle = sl_getString(0); const char *sUrl = sl_getString(0); - DEBUG_COMMAND_YET("sysAddWebMenu %s, %s:\n", sTitle, sUrl); + DEBUG_COMMAND_YET("sysAddWebMenu %s, %s:", sTitle, sUrl); } void commands2F4A() { int eTime = getCaliValue(); ags_setCursorMoveTime(eTime); - DEBUG_COMMAND("iptSetMoveCursorTime %d:\n", eTime); + DEBUG_COMMAND("iptSetMoveCursorTime %d:", eTime); } void commands2F4B() { int *vTime = getCaliVariable(); *vTime = ags_getCursorMoveTime(); - DEBUG_COMMAND("iptGetMoveCursorTime %d:\n", *vTime); + DEBUG_COMMAND("iptGetMoveCursorTime %d:", *vTime); } void commands2F4C() { @@ -823,7 +823,7 @@ void commands2F4C() { sdl_updateArea(&r, &p); - DEBUG_COMMAND("grBlt %d, %d, %d, %d, %d, %d:\n", + DEBUG_COMMAND("grBlt %d, %d, %d, %d, %d, %d:", eX, eY, eSrcX, eSrcY, eWidth, eHeight); } @@ -831,21 +831,21 @@ void commands2F4D() { int eNum = getCaliValue(); const char *sText = sl_getString(0); - DEBUG_COMMAND_YET("LXWT %d, %s:\n", eNum, sText); + DEBUG_COMMAND_YET("LXWT %d, %s:", eNum, sText); } void commands2F4E() { int eNum = getCaliValue(); int eTextNum = getCaliValue(); - DEBUG_COMMAND_YET("LXWS %d, %d:\n", eNum, eTextNum); + DEBUG_COMMAND_YET("LXWS %d, %d:", eNum, eTextNum); } void commands2F4F() { int eNum = getCaliValue(); int eType = getCaliValue(); - DEBUG_COMMAND_YET("LXWE %d, %d:\n", eNum, eType); + DEBUG_COMMAND_YET("LXWE %d, %d:", eNum, eType); } void commands2F50() { @@ -853,7 +853,7 @@ void commands2F50() { int nFlg = sl_getc(); int eNum = getCaliValue(); - DEBUG_COMMAND_YET("LXWH %d, %d, %d:\n", eFile, nFlg, eNum); + DEBUG_COMMAND_YET("LXWH %d, %d, %d:", eFile, nFlg, eNum); } void commands2F51() { @@ -861,7 +861,7 @@ void commands2F51() { int nFlg = sl_getc(); int eNum = getCaliValue(); - DEBUG_COMMAND_YET("LXWHH %d, %d, %d:\n", eFile, nFlg, eNum); + DEBUG_COMMAND_YET("LXWHH %d, %d, %d:", eFile, nFlg, eNum); } void commands2F52() { @@ -872,7 +872,7 @@ void commands2F52() { struct utsname un; char s[256]; if (uname(&un) < 0) return; - NOTICE("sysname %s nodename %s release %s version %s machine %s\n", + NOTICE("sysname %s nodename %s release %s version %s machine %s", un.sysname, un.nodename, un.release, un.version, un.machine); sprintf(s,"%s %s %s", un.sysname, un.release, un.machine); @@ -881,7 +881,7 @@ void commands2F52() { #endif svar_set(eNum, s); - DEBUG_COMMAND("sysGetOsName %d: %s\n", eNum, s); + DEBUG_COMMAND("sysGetOsName %d: %s", eNum, s); } void commands2F53() { @@ -889,7 +889,7 @@ void commands2F53() { nact->patch_ec = eFlag; - DEBUG_COMMAND("patchEC %d:\n", eFlag); + DEBUG_COMMAND("patchEC %d:", eFlag); } void commands2F54() { @@ -898,7 +898,7 @@ void commands2F54() { int eWidth = getCaliValue(); int eHeight = getCaliValue(); - DEBUG_COMMAND_YET("mathSetClipWindow %d, %d, %d, %d:\n", eX, eY, eWidth, eHeight); + DEBUG_COMMAND_YET("mathSetClipWindow %d, %d, %d, %d:", eX, eY, eWidth, eHeight); } void commands2F55() { @@ -909,7 +909,7 @@ void commands2F55() { int *vWidth = getCaliVariable(); int *vHeight = getCaliVariable(); - DEBUG_COMMAND_YET("mathClip %d, %d, %d, %d, %d, %d:\n", + DEBUG_COMMAND_YET("mathClip %d, %d, %d, %d, %d, %d:", *vDx, *vDy, *vSx, *vSy, *vWidth, *vHeight); } @@ -918,7 +918,7 @@ void commands2F56() { const char *title = sl_getString(0); const char *folder = sl_getString(0); - DEBUG_COMMAND_YET("LXF %d, %s, %s:\n", file_name, title, folder); + DEBUG_COMMAND_YET("LXF %d, %s, %s:", file_name, title, folder); } void commands2F57() { @@ -947,7 +947,7 @@ void commands2F57() { } free(t1); free(t2); - DEBUG_COMMAND("strInputDlg %s, %d, %d, %d:\n", + DEBUG_COMMAND("strInputDlg %s, %d, %d, %d:", sTitle, eStrVar, eLength, *vResult); } @@ -957,7 +957,7 @@ void commands2F58() { *vResult = sjis_has_hankaku(svar_get(eNum)) ? 1 : 0; - DEBUG_COMMAND("strCheckASCII %d, %d:\n", eNum, *vResult); + DEBUG_COMMAND("strCheckASCII %d, %d:", eNum, *vResult); } void commands2F59() { @@ -966,7 +966,7 @@ void commands2F59() { *vResult = sjis_has_zenkaku(svar_get(eNum)) ? 1 : 0; - DEBUG_COMMAND("strCheckSJIS %d, %d:\n", eNum, *vResult); + DEBUG_COMMAND("strCheckSJIS %d, %d:", eNum, *vResult); } void commands2F5A() { @@ -977,7 +977,7 @@ void commands2F5A() { menu_msgbox_open(t1); free(t1); - DEBUG_COMMAND("strMessageBox %s:\n", sText); + DEBUG_COMMAND("strMessageBox %s:", sText); } void commands2F5B() { @@ -988,7 +988,7 @@ void commands2F5B() { menu_msgbox_open(t1); free(t1); - DEBUG_COMMAND("strMessageBoxStr %d:\n", eNum); + DEBUG_COMMAND("strMessageBoxStr %d:", eNum); } void commands2F5C() { @@ -1001,7 +1001,7 @@ void commands2F5C() { int eAlpha = getCaliValue(); ags_copyArea_shadow_withrate(eSrcX, eSrcY, eWidth, eHeight, eDestX, eDestY, eAlpha); - DEBUG_COMMAND("grCopyUseAMapUseA %d, %d, %d, %d, %d, %d, %d:\n", + DEBUG_COMMAND("grCopyUseAMapUseA %d, %d, %d, %d, %d, %d, %d:", eDestX, eDestY, eSrcX, eSrcY, eWidth, eHeight, eAlpha); } @@ -1009,7 +1009,7 @@ void commands2F5D() { int eNum = getCaliValue(); int eData = getCaliValue(); - DEBUG_COMMAND_YET("grSetCEParam %d, %d:\n", eNum, eData); + DEBUG_COMMAND_YET("grSetCEParam %d, %d:", eNum, eData); } struct grEffectMoveView_data { @@ -1040,24 +1040,24 @@ void commands2F5E() { .target_y = eY }; ags_runEffect(eTime, eFlag, grEffectMoveView_step, &data); - DEBUG_COMMAND("grEffectMoveView %d, %d, %d, %d:\n", eX, eY, eTime, eFlag); + DEBUG_COMMAND("grEffectMoveView %d, %d, %d, %d:", eX, eY, eTime, eFlag); } void commands2F5F() { int eSize = getCaliValue(); - DEBUG_COMMAND_YET("cgSetCacheSize %d:\n", eSize); + DEBUG_COMMAND_YET("cgSetCacheSize %d:", eSize); } void commands2F61() { int eChar = getCaliValue(); int eCGNum = getCaliValue(); - DEBUG_COMMAND_YET("gaijiSet %d, %d:\n", eChar, eCGNum); + DEBUG_COMMAND_YET("gaijiSet %d, %d:", eChar, eCGNum); } void commands2F62() { - DEBUG_COMMAND_YET("gaijiClearAll:\n"); + DEBUG_COMMAND_YET("gaijiClearAll:"); } void commands2F63() { @@ -1065,7 +1065,7 @@ void commands2F63() { *vSelect = sel_getLastElement(); - DEBUG_COMMAND("menuGetLatestSelect %d:\n", *vSelect); + DEBUG_COMMAND("menuGetLatestSelect %d:", *vSelect); } void commands2F64() { @@ -1105,7 +1105,7 @@ void commands2F64() { ald_freedata(dfile); - DEBUG_COMMAND("lnkIsLink %d, %d, %d:\n", eType, eNum, *vResult); + DEBUG_COMMAND("lnkIsLink %d, %d, %d:", eType, eNum, *vResult); } void commands2F65() { @@ -1146,7 +1146,7 @@ void commands2F65() { ald_freedata(dfile); - DEBUG_COMMAND("lnkIsData %d, %d, %d:\n", eType, eNum, *vResult); + DEBUG_COMMAND("lnkIsData %d, %d, %d:", eType, eNum, *vResult); } void commands2F66() { @@ -1154,10 +1154,10 @@ void commands2F66() { int page = sl_getw(); int index = sl_getdw(); - DEBUG_COMMAND("fncSetTable %d, %d,%d:\n", eNum, page, index); + DEBUG_COMMAND("fncSetTable %d, %d,%d:", eNum, page, index); if (eNum >= FCTBL_MAX) { - WARNING("fncSetTable: too many table number %d\n", eNum); + WARNING("fncSetTable: too many table number %d", eNum); return; } @@ -1181,16 +1181,16 @@ void commands2F67() { *vResult = (i == nact->ain.fncnum) ? 0 : !0; - DEBUG_COMMAND("fncSetTableFromStr %d, %d, %d:\n", eNum, eStrNum, *vResult); + DEBUG_COMMAND("fncSetTableFromStr %d, %d, %d:", eNum, eStrNum, *vResult); } void commands2F68() { int eNum = getCaliValue(); - DEBUG_COMMAND("fncClearTable %d:\n", eNum); + DEBUG_COMMAND("fncClearTable %d:", eNum); if (eNum >= FCTBL_MAX) { - WARNING("fncClearTable: too many table number %d\n", eNum); + WARNING("fncClearTable: too many table number %d", eNum); return; } @@ -1201,10 +1201,10 @@ void commands2F68() { void commands2F69() { int eNum = getCaliValue(); - DEBUG_COMMAND("fncCall %d:\n", eNum); + DEBUG_COMMAND("fncCall %d:", eNum); if (eNum >= FCTBL_MAX) { - WARNING("fncClearTable: too many table number %d\n", eNum); + WARNING("fncClearTable: too many table number %d", eNum); return; } @@ -1220,7 +1220,7 @@ void commands2F6A() { nact->fnc_return_value = eNum; - DEBUG_COMMAND("fncSetReturnCode %d:\n", eNum); + DEBUG_COMMAND("fncSetReturnCode %d:", eNum); } void commands2F6B() { @@ -1228,7 +1228,7 @@ void commands2F6B() { *vNum = nact->fnc_return_value; - DEBUG_COMMAND("fncGetReturnCode %d:\n", *vNum); + DEBUG_COMMAND("fncGetReturnCode %d:", *vNum); } void commands2F6C() { @@ -1236,7 +1236,7 @@ void commands2F6C() { nact->is_msg_out = eFlag != 0 ? TRUE : FALSE; - DEBUG_COMMAND("msgSetOutputFlag %d:\n", eFlag); + DEBUG_COMMAND("msgSetOutputFlag %d:", eFlag); } void commands2F6D() { @@ -1245,13 +1245,13 @@ void commands2F6D() { *vResult = save_delete_file(eNum -1); - DEBUG_COMMAND("saveDeleteFile %d, %d:\n", eNum, *vResult); + DEBUG_COMMAND("saveDeleteFile %d, %d:", eNum, *vResult); } void commands2F6E() { int eFlag = getCaliValue(); - DEBUG_COMMAND_YET("wav3DSetUseFlag %d:\n", eFlag); + DEBUG_COMMAND_YET("wav3DSetUseFlag %d:", eFlag); } void commands2F6F() { @@ -1262,7 +1262,7 @@ void commands2F6F() { mus_wav_fadeout_start(eCh, eTime, eVolume, eStopFlag); - DEBUG_COMMAND("wavFadeVolume %d, %d, %d, %d:\n", eCh, eTime, eVolume, eStopFlag); + DEBUG_COMMAND("wavFadeVolume %d, %d, %d, %d:", eCh, eTime, eVolume, eStopFlag); } void commands2F70() { @@ -1270,7 +1270,7 @@ void commands2F70() { nact->patch_emen = eFlag; - DEBUG_COMMAND("patchEMEN %d:\n", eFlag); + DEBUG_COMMAND("patchEMEN %d:", eFlag); } void commands2F71() { @@ -1278,13 +1278,13 @@ void commands2F71() { msgskip_enableMenu(eFlag); - DEBUG_COMMAND("wmenuEnableMsgSkip %d:\n", eFlag); + DEBUG_COMMAND("wmenuEnableMsgSkip %d:", eFlag); } void commands2F72() { int *vFlag = getCaliVariable(); - DEBUG_COMMAND_YET("winGetFlipFlag %p:\n", vFlag); + DEBUG_COMMAND_YET("winGetFlipFlag %p:", vFlag); } void commands2F73() { @@ -1292,14 +1292,14 @@ void commands2F73() { *vTrack = mus_cdrom_get_maxtrack(); - DEBUG_COMMAND("cdGetMaxTrack %d:\n", *vTrack); + DEBUG_COMMAND("cdGetMaxTrack %d:", *vTrack); } void commands2F74() { const char *str1 = sl_getString(0); int *var = getCaliVariable(); - DEBUG_COMMAND_YET("dlgErrorOkCancel %s,%d:\n", str1, *var); + DEBUG_COMMAND_YET("dlgErrorOkCancel %s,%d:", str1, *var); } void commands2F75() { @@ -1307,7 +1307,7 @@ void commands2F75() { sel_reduce(eNumof); - DEBUG_COMMAND("menuReduce %d:\n", eNumof); + DEBUG_COMMAND("menuReduce %d:", eNumof); } void commands2F76() { @@ -1315,8 +1315,8 @@ void commands2F76() { *var = sel_getnumberof(); - //DEBUG_COMMAND("menuGetNumof %p:\n", var); - DEBUG_COMMAND("menuGetNumof %d:\n", *var); + //DEBUG_COMMAND("menuGetNumof %p:", var); + DEBUG_COMMAND("menuGetNumof %d:", *var); } void commands2F77() { @@ -1325,7 +1325,7 @@ void commands2F77() { svar_set(eStrNum, sel_gettext(eSelectNum)); - DEBUG_COMMAND("menuGetText %d,%d:\n", eStrNum, eSelectNum); + DEBUG_COMMAND("menuGetText %d,%d:", eStrNum, eSelectNum); } void commands2F78() { @@ -1334,7 +1334,7 @@ void commands2F78() { sel_goto(eSelectNum, eClearFlag); - DEBUG_COMMAND("menuGoto %d,%d:\n", eSelectNum, eClearFlag); + DEBUG_COMMAND("menuGoto %d,%d:", eSelectNum, eClearFlag); } void commands2F79() { @@ -1343,17 +1343,17 @@ void commands2F79() { sel_returengoto(eSelectNum, eClearFlag); - DEBUG_COMMAND("menuReturnGoto %d,%d:\n", eSelectNum, eClearFlag); + DEBUG_COMMAND("menuReturnGoto %d,%d:", eSelectNum, eClearFlag); } void commands2F7A() { // no-op - DEBUG_COMMAND("menuFreeShelterDIB:\n"); + DEBUG_COMMAND("menuFreeShelterDIB:"); } void commands2F7B() { // no-op - DEBUG_COMMAND("msgFreeShelterDIB:\n"); + DEBUG_COMMAND("msgFreeShelterDIB:"); } void commands2F7C() { @@ -1367,13 +1367,13 @@ void commands2F7C() { int index = sl_getdw(); if (index >= nact->ain.msgnum) { - WARNING("message id out of bounds (%d)\n", index); + WARNING("message id out of bounds (%d)", index); return; } sys_addMsg(nact->ain.msg[index]); msgskip_onAinMessage(index); - DEBUG_COMMAND("2F7C %d:\n", index); + DEBUG_COMMAND("2F7C %d:", index); } void commands2F7D() { @@ -1382,7 +1382,7 @@ void commands2F7D() { commandH(); msgskip_onAinMessage(index); - DEBUG_COMMAND("2F7D %d:\n", index); + DEBUG_COMMAND("2F7D %d:", index); } void commands2F7E() { @@ -1391,7 +1391,7 @@ void commands2F7E() { commandHH(); msgskip_onAinMessage(index); - DEBUG_COMMAND("2F7E %d:\n", index); + DEBUG_COMMAND("2F7E %d:", index); } void commands2F7F() { @@ -1401,7 +1401,7 @@ void commands2F7F() { sys_addMsg(svar_get(p1)); msgskip_onAinMessage(index); - DEBUG_COMMAND("2F7F %d, %d(%s):\n", index, p1, svar_get(p1)); + DEBUG_COMMAND("2F7F %d, %d(%s):", index, p1, svar_get(p1)); } void commands2F80() { @@ -1409,10 +1409,10 @@ void commands2F80() { int index = sl_getdw(); if (NULL == (nact->datatbl_addr = sl_setDataTable(page -1, index))) { - WARNING("dataSetPointer set failed\n"); + WARNING("dataSetPointer set failed"); } - DEBUG_COMMAND("dataSetPointer %d,%x\n", page, index); + DEBUG_COMMAND("dataSetPointer %d,%x", page, index); } void commands2F81() { @@ -1429,7 +1429,7 @@ void commands2F81() { nact->datatbl_addr = p; - DEBUG_COMMAND("dataGetWORD %p,%d(%p):\n", vData, eNumof, nact->datatbl_addr); + DEBUG_COMMAND("dataGetWORD %p,%d(%p):", vData, eNumof, nact->datatbl_addr); } void commands2F82() { @@ -1438,7 +1438,7 @@ void commands2F82() { int i; char *p = (char *)nact->datatbl_addr; - DEBUG_COMMAND("dataGetString %d,%d:\n", eStrNum, eNumof); + DEBUG_COMMAND("dataGetString %d,%d:", eStrNum, eNumof); for (i = 0; i < eNumof; i++) { svar_set(eStrNum + i, p); @@ -1456,7 +1456,7 @@ void commands2F83() { nact->datatbl_addr = p; - DEBUG_COMMAND("dataSkipWORD %d:\n", eNumof); + DEBUG_COMMAND("dataSkipWORD %d:", eNumof); } void commands2F84() { @@ -1470,7 +1470,7 @@ void commands2F84() { nact->datatbl_addr = p; - DEBUG_COMMAND("dataSkipString %d:\n", eNumof); + DEBUG_COMMAND("dataSkipString %d:", eNumof); } void commands2F85() { @@ -1478,7 +1478,7 @@ void commands2F85() { *vResult = nact->ain.varnum; - DEBUG_COMMAND("varGetNumof %p:\n", vResult); + DEBUG_COMMAND("varGetNumof %p:", vResult); } void commands2F86() { @@ -1486,7 +1486,7 @@ void commands2F86() { nact->patch_g0 = eFlag; - DEBUG_COMMAND("patchG0 %d:\n", eFlag); + DEBUG_COMMAND("patchG0 %d:", eFlag); } void commands2F87() { @@ -1497,7 +1497,7 @@ void commands2F87() { *vResult = 1; - DEBUG_COMMAND("regReadString %d,%d,%d,%d:\n", + DEBUG_COMMAND("regReadString %d,%d,%d,%d:", eSubKeyStrNum, eBaneStrNum, eResultStrNum, *vResult); } @@ -1507,7 +1507,7 @@ void commands2F88() { *vResult = 1; - DEBUG_COMMAND("fileCheckExist %d,%d:\n", eFileNameStrNum, *vResult); + DEBUG_COMMAND("fileCheckExist %d,%d:", eFileNameStrNum, *vResult); } void commands2F89() { @@ -1516,14 +1516,14 @@ void commands2F89() { int eData = getCaliValue(); int *vResult = getCaliVariable(); - DEBUG_COMMAND_YET("timeCheckCurDate %d,%d,%d,%p:\n", eYear, eMonth, eData, vResult); + DEBUG_COMMAND_YET("timeCheckCurDate %d,%d,%d,%p:", eYear, eMonth, eData, vResult); } void commands2F8A() { const char *s2 = sl_getConstString(); const char *s3 = sl_getConstString(); - DEBUG_COMMAND_YET("dlgManualProtect %s,%s:\n", s2, s3); + DEBUG_COMMAND_YET("dlgManualProtect %s,%s:", s2, s3); } void commands2F8B() { @@ -1535,11 +1535,11 @@ void commands2F8B() { *c7 = 1; - DEBUG_COMMAND_YET("fileCheckDVD %s,%d,%d,%s,%p:\n", s2, c3, c4, s6, c7); + DEBUG_COMMAND_YET("fileCheckDVD %s,%d,%d,%s,%p:", s2, c3, c4, s6, c7); } void commands2F8C() { - DEBUG_COMMAND("sysReset:\n"); + DEBUG_COMMAND("sysReset:"); nact_quit(TRUE); } diff --git a/src/cmd_check.c b/src/cmd_check.c index 4b111d8..f492481 100644 --- a/src/cmd_check.c +++ b/src/cmd_check.c @@ -51,7 +51,7 @@ static void letVar(int type) { int val = getCaliValue(); if (varno == NULL) { - WARNING("varno is NULL\n"); + WARNING("varno is NULL"); return; } @@ -93,7 +93,7 @@ static void getDataTableAdr() { } if (NULL == (nact->datatbl_addr = sl_setDataTable(sl_getPage(), index))) { - WARNING("data table address set failed\n"); + WARNING("data table address set failed"); } } @@ -535,7 +535,7 @@ void exec_command(void) { /* hit Any Key */ sys_hit_any_key(); msg_nextPage(TRUE); - DEBUG_COMMAND("A\n"); + DEBUG_COMMAND("A"); break; case 'B': switch(sl_getc()) { @@ -1081,7 +1081,7 @@ void exec_command(void) { { int num=getCaliValue(); sys_addMsg(svar_get(num)); - DEBUG_COMMAND("X %d:\n", num); + DEBUG_COMMAND("X %d:", num); } break; case 'Y': diff --git a/src/cmdb.c b/src/cmdb.c index 9dc2244..70d83e4 100644 --- a/src/cmdb.c +++ b/src/cmdb.c @@ -43,7 +43,7 @@ void commandB0() { break; } - DEBUG_COMMAND("B0 %d:\n", num); + DEBUG_COMMAND("B0 %d:", num); } void commandB1() { @@ -64,7 +64,7 @@ void commandB1() { nact->sel.wininfo[num].height = Y2; nact->sel.wininfo[num].save = (V == 0) ? false : true; - DEBUG_COMMAND("B1 %d,%d,%d,%d,%d,%d:\n", num + 1, X1, Y1, X2, Y2, V); + DEBUG_COMMAND("B1 %d,%d,%d,%d,%d,%d:", num + 1, X1, Y1, X2, Y2, V); } void commandB2() { @@ -89,7 +89,7 @@ void commandB2() { nact->sel.FrameCgNoBot = C3; nact->sel.Framedot = W == 0 ? 0 : W == 1 ? 8 : dot ; - DEBUG_COMMAND("B2 %d,%d,%d,%d,%d,%d:\n", num, W, C1, C2, C3, dot); + DEBUG_COMMAND("B2 %d,%d,%d,%d,%d,%d:", num, W, C1, C2, C3, dot); } void commandB3() { @@ -110,7 +110,7 @@ void commandB3() { nact->msg.wininfo[num].height = Y2; nact->msg.wininfo[num].save = (V == 0) ? FALSE : TRUE; - DEBUG_COMMAND("B3 %d,%d,%d,%d,%d,%d:\n", num + 1, X1, Y1, X2, Y2, V); + DEBUG_COMMAND("B3 %d,%d,%d,%d,%d,%d:", num + 1, X1, Y1, X2, Y2, V); } void commandB4() { @@ -130,7 +130,7 @@ void commandB4() { nact->msg.win = &nact->msg.wininfo[num - 1]; msg_openWindow(W, C1, C2, N, M); - DEBUG_COMMAND("B4 %d,%d,%d,%d,%d,%d:\n", num, W, C1, C2, N, M); + DEBUG_COMMAND("B4 %d,%d,%d,%d,%d,%d:", num, W, C1, C2, N, M); } void commandB10() { @@ -141,7 +141,7 @@ void commandB10() { msg_getMessageLocation(&p); *x_var = p.x; *y_var = p.y; - DEBUG_COMMAND("B10 %d,%d:\n", *x_var, *y_var); + DEBUG_COMMAND("B10 %d,%d:", *x_var, *y_var); } void commandB11() { @@ -151,28 +151,28 @@ void commandB11() { *sel_no_var = nact->sel.winno; *msg_no_var = nact->msg.winno; - DEBUG_COMMAND("B11 %d,%d:\n", *sel_no_var, *msg_no_var); + DEBUG_COMMAND("B11 %d,%d:", *sel_no_var, *msg_no_var); } void commandB12() { int *var = getCaliVariable(); *var = sel_getRegistoredElementNumber(); - DEBUG_COMMAND("B12 %d:\n", *var); + DEBUG_COMMAND("B12 %d:", *var); } void commandB13() { int *var = getCaliVariable(); *var = sel_getRegistoredElementWidth(); - DEBUG_COMMAND("B13 %d:\n", *var); + DEBUG_COMMAND("B13 %d:", *var); } void commandB14() { int *var = getCaliVariable(); *var = sel_getRegistoredElement_strlen(); - DEBUG_COMMAND("B14 %d:\n", *var); + DEBUG_COMMAND("B14 %d:", *var); } void commandB21() { @@ -183,7 +183,7 @@ void commandB21() { *x_var = nact->sel.win->x; *y_var = nact->sel.win->y; - DEBUG_COMMAND("B21 %d,%d,%d:\n", no, *x_var, *y_var); + DEBUG_COMMAND("B21 %d,%d,%d:", no, *x_var, *y_var); } void commandB22() { @@ -194,7 +194,7 @@ void commandB22() { *x_var = nact->sel.win->width; *y_var = nact->sel.win->height; - DEBUG_COMMAND("B22 %d,%d,%d:\n", no, *x_var, *y_var); + DEBUG_COMMAND("B22 %d,%d,%d:", no, *x_var, *y_var); } void commandB23() { @@ -205,7 +205,7 @@ void commandB23() { *x_var = nact->msg.win->x; *y_var = nact->msg.win->y; - DEBUG_COMMAND("B23 %d,%d,%d:\n", no, *x_var, *y_var); + DEBUG_COMMAND("B23 %d,%d,%d:", no, *x_var, *y_var); } void commandB24() { @@ -216,7 +216,7 @@ void commandB24() { *x_var_size = nact->msg.win->width; *y_var_size = nact->msg.win->height; - DEBUG_COMMAND("B24 %d,%d,%d:\n", no, *x_var_size, *y_var_size); + DEBUG_COMMAND("B24 %d,%d,%d:", no, *x_var_size, *y_var_size); } void commandB31() { @@ -228,7 +228,7 @@ void commandB31() { *x_var = nact->sel.wininfo[no - 1].x; *y_var = nact->sel.wininfo[no - 1].y; - DEBUG_COMMAND("B31 %d,%d,%d:\n", no, *x_var, *y_var); + DEBUG_COMMAND("B31 %d,%d,%d:", no, *x_var, *y_var); } void commandB32() { @@ -239,7 +239,7 @@ void commandB32() { *x_var_size = nact->sel.wininfo[no - 1].width; *y_var_size = nact->sel.wininfo[no - 1].height; - DEBUG_COMMAND("B32 %d,%d,%d:\n", no, *x_var_size, *y_var_size); + DEBUG_COMMAND("B32 %d,%d,%d:", no, *x_var_size, *y_var_size); } void commandB33() { @@ -249,7 +249,7 @@ void commandB33() { *x_var = nact->msg.wininfo[no - 1].x; *y_var = nact->msg.wininfo[no - 1].y; - DEBUG_COMMAND("B33 %d,%d,%d:\n", no, *x_var, *y_var); + DEBUG_COMMAND("B33 %d,%d,%d:", no, *x_var, *y_var); } void commandB34() { @@ -259,6 +259,6 @@ void commandB34() { *x_var_size = nact->msg.wininfo[no - 1].width; *y_var_size = nact->msg.wininfo[no - 1].height; - DEBUG_COMMAND("B34 %d,%d,%d:\n", no, *x_var_size, *y_var_size); + DEBUG_COMMAND("B34 %d,%d,%d:", no, *x_var_size, *y_var_size); } diff --git a/src/cmdc.c b/src/cmdc.c index 305acf6..15917f1 100644 --- a/src/cmdc.c +++ b/src/cmdc.c @@ -39,7 +39,7 @@ void commandCC() { ags_copyArea(src_x, src_y, width, height, dst_x, dst_y); ags_updateArea(dst_x, dst_y, width, height); - DEBUG_COMMAND("CC %d,%d,%d,%d,%d,%d:\n", src_x, src_y, width, height, dst_x, dst_y); + DEBUG_COMMAND("CC %d,%d,%d,%d,%d,%d:", src_x, src_y, width, height, dst_x, dst_y); } void commandCS() { @@ -54,7 +54,7 @@ void commandCS() { ags_copyAreaSP(src_x, src_y, width, height, dst_x, dst_y, sprite); ags_updateArea(dst_x, dst_y, width, height); - DEBUG_COMMAND("CS %d,%d,%d,%d,%d,%d,%d:\n", src_x, src_y, width, height, dst_x, dst_y, sprite); + DEBUG_COMMAND("CS %d,%d,%d,%d,%d,%d,%d:", src_x, src_y, width, height, dst_x, dst_y, sprite); } void commandCX() { @@ -91,11 +91,11 @@ void commandCX() { ags_copyToAlpha(src_x, src_y, width, height, dst_x, dst_y, col == 1 ? FROM_24R : col == 2 ? FROM_24G : FROM_24B); break; case 6: - DEBUG_COMMAND_YET("CX %d,%d,%d,%d,%d,%d,%d,%d:\n", mode, src_x, src_y, width, height, dst_x, dst_y, col); + DEBUG_COMMAND_YET("CX %d,%d,%d,%d,%d,%d,%d,%d:", mode, src_x, src_y, width, height, dst_x, dst_y, col); break; } - DEBUG_COMMAND("CX %d,%d,%d,%d,%d,%d,%d,%d:\n", mode, src_x, src_y, width, height, dst_x, dst_y, col); + DEBUG_COMMAND("CX %d,%d,%d,%d,%d,%d,%d,%d:", mode, src_x, src_y, width, height, dst_x, dst_y, col); } void commandCM() { @@ -112,7 +112,7 @@ void commandCM() { ags_scaledCopyArea(src_x, src_y, src_width, src_height, dst_x, dst_y, dst_width, dst_height, mirror_sw); ags_updateArea(dst_x, dst_y, dst_width, dst_height); - DEBUG_COMMAND("CM %d,%d,%d,%d,%d,%d,%d,%d,%d:\n", src_x, src_y, src_width, src_height, dst_x, dst_y, dst_width, dst_height, mirror_sw); + DEBUG_COMMAND("CM %d,%d,%d,%d,%d,%d,%d,%d,%d:", src_x, src_y, src_width, src_height, dst_x, dst_y, dst_width, dst_height, mirror_sw); } void commandCE() { @@ -137,10 +137,10 @@ void commandCE() { case 54: case 1000: case 1001: - DEBUG_COMMAND_YET("CE %d,%d,%d,%d,%d,%d,%d,%d,%d:\n", src_x, src_y, width, height, dst_x, dst_y, effect_sw, option, wait_flag); + DEBUG_COMMAND_YET("CE %d,%d,%d,%d,%d,%d,%d,%d,%d:", src_x, src_y, width, height, dst_x, dst_y, effect_sw, option, wait_flag); break; default: - DEBUG_COMMAND("CE %d,%d,%d,%d,%d,%d,%d,%d,%d:\n", src_x, src_y, width, height, dst_x, dst_y, effect_sw, option, wait_flag); + DEBUG_COMMAND("CE %d,%d,%d,%d,%d,%d,%d,%d,%d:", src_x, src_y, width, height, dst_x, dst_y, effect_sw, option, wait_flag); } } @@ -178,10 +178,10 @@ void commandCD() { case 1000: case 2000: case 2001: - DEBUG_COMMAND_YET("CD %d,%d,%d,%d,%d,%d,%d,%d,%d,%d:\n", src_x, src_y, width, height, dst_x, dst_y, effect_sw, option, wait_flag, color); + DEBUG_COMMAND_YET("CD %d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", src_x, src_y, width, height, dst_x, dst_y, effect_sw, option, wait_flag, color); break; default: - DEBUG_COMMAND("CD %d,%d,%d,%d,%d,%d,%d,%d,%d,%d:\n", src_x, src_y, width, height, dst_x, dst_y, effect_sw, option, wait_flag, color); + DEBUG_COMMAND("CD %d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", src_x, src_y, width, height, dst_x, dst_y, effect_sw, option, wait_flag, color); } } @@ -200,14 +200,14 @@ void commandCK() { case 1: ags_wrapColor(x, y, width, height, d1, d2); break; case 2: - DEBUG_COMMAND_YET("CK %d,%d,%d,%d,%d,%d,%d,%d,%d:\n", no, x, y, width, height, d1, d2, d3, d4); break; + DEBUG_COMMAND_YET("CK %d,%d,%d,%d,%d,%d,%d,%d,%d:", no, x, y, width, height, d1, d2, d3, d4); break; case 3: /* from T2 */ ags_changeColorArea(x, y, width, height, d1, d2, d3); break; default: - WARNING("Unknown CK Command %d\n", no); + WARNING("Unknown CK Command %d", no); } ags_updateArea(x, y, width, height); - DEBUG_COMMAND("CK %d,%d,%d,%d,%d,%d,%d,%d,%d:\n", no, x, y, width, height, d1, d2, d3, d4); + DEBUG_COMMAND("CK %d,%d,%d,%d,%d,%d,%d,%d,%d:", no, x, y, width, height, d1, d2, d3, d4); } void commandCL() { @@ -220,7 +220,7 @@ void commandCL() { ags_drawLine(x0, y0, x1, y1, color); ags_updateArea(min(x0, x1), min(y0, y1), abs(x1 - x0) + 1, abs(y1 - y0) + 1); - DEBUG_COMMAND("CL %d,%d,%d,%d,%d:\n", x0, y0, x1, y1, color); + DEBUG_COMMAND("CL %d,%d,%d,%d,%d:", x0, y0, x1, y1, color); } void commandCB() { @@ -233,7 +233,7 @@ void commandCB() { ags_drawRectangle(x, y, width, height, color); ags_updateArea (x, y, width, height); - DEBUG_COMMAND("CB %d,%d,%d,%d,%d:\n", x, y, width, height, color); + DEBUG_COMMAND("CB %d,%d,%d,%d,%d:", x, y, width, height, color); } void commandCF() { @@ -246,7 +246,7 @@ void commandCF() { ags_fillRectangle(x, y, width, height, color); ags_updateArea (x, y, width, height); - DEBUG_COMMAND("CF %d,%d,%d,%d,%d:\n", x, y, width, height, color); + DEBUG_COMMAND("CF %d,%d,%d,%d,%d:", x, y, width, height, color); } void commandCP() { @@ -258,7 +258,7 @@ void commandCP() { if (!SDL_RectEmpty(&rec)) ags_updateArea(rec.x, rec.y, rec.w, rec.h); - DEBUG_COMMAND("CP %d,%d,%d:\n", x, y, color); + DEBUG_COMMAND("CP %d,%d,%d:", x, y, color); } void commandCT() { @@ -268,7 +268,7 @@ void commandCT() { int y = getCaliValue(); ags_alpha_getPixel(x, y, var); - DEBUG_COMMAND("CT %d,%d,%d:\n", *var, x, y); + DEBUG_COMMAND("CT %d,%d,%d:", *var, x, y); } void commandCU() { @@ -281,7 +281,7 @@ void commandCU() { int set = getCaliValue(); ags_alpha_lowercut(x, y, width, height, border, set); - DEBUG_COMMAND("CU %d,%d,%d,%d,%d,%d:\n", x, y, width, height, border, set); + DEBUG_COMMAND("CU %d,%d,%d,%d,%d,%d:", x, y, width, height, border, set); } void commandCV() { @@ -294,7 +294,7 @@ void commandCV() { int set = getCaliValue(); ags_alpha_uppercut(x, y, width, height, border, set); - DEBUG_COMMAND("CV %d,%d,%d,%d,%d,%d:\n", x, y, width, height, border, set); + DEBUG_COMMAND("CV %d,%d,%d,%d,%d,%d:", x, y, width, height, border, set); } void commandCY() { @@ -306,7 +306,7 @@ void commandCY() { int lv = getCaliValue(); ags_alpha_setLevel(x, y, w, h, lv); - DEBUG_COMMAND("CY %d,%d,%d,%d,%d:\n", x, y, w, h, lv); + DEBUG_COMMAND("CY %d,%d,%d,%d,%d:", x, y, w, h, lv); } void commandCZ() { @@ -320,5 +320,5 @@ void commandCZ() { int op = getCaliValue(); ags_alpha_copyArea(sx, sy, w, h, dx, dy); - DEBUG_COMMAND("CZ %d,%d,%d,%d,%d,%d,%d:\n", sx, sy, w, h, dx, dy, op); + DEBUG_COMMAND("CZ %d,%d,%d,%d,%d,%d,%d:", sx, sy, w, h, dx, dy, op); } diff --git a/src/cmdd.c b/src/cmdd.c index 37e0405..c73a21c 100644 --- a/src/cmdd.c +++ b/src/cmdd.c @@ -33,8 +33,8 @@ void commandDC() { int save = getCaliValue(); if (!v_allocatePage(page, maxindex + 1, !!save)) - WARNING("Array allocation failed: page=%d size=%d\n", page, maxindex); - DEBUG_COMMAND("DC %d,%d,%d:\n", page, maxindex, save); + WARNING("Array allocation failed: page=%d size=%d", page, maxindex); + DEBUG_COMMAND("DC %d,%d,%d:", page, maxindex, save); } void commandDI() { @@ -44,7 +44,7 @@ void commandDI() { v_getPageStatus(page, var_use, var_size); - DEBUG_COMMAND("DI %d,%p,%p:\n", page, var_use, var_size); + DEBUG_COMMAND("DI %d,%p,%p:", page, var_use, var_size); } void commandDS() { @@ -54,10 +54,10 @@ void commandDS() { int offset = getCaliValue(); int page = getCaliValue(); - DEBUG_COMMAND("DS %p,%d,%d,%d:\n",point_var, data_var.var, offset, page); + DEBUG_COMMAND("DS %p,%d,%d,%d:",point_var, data_var.var, offset, page); if (!v_bindArray(data_var.var, point_var, offset, page)) { - WARNING("commandDS(): Array allocate failed\n"); - WARNING("if you are playing 'Pastel Chime', please patch to scenario(see patch/README.TXT for detail)\n"); + WARNING("commandDS(): Array allocate failed"); + WARNING("if you are playing 'Pastel Chime', please patch to scenario(see patch/README.TXT for detail)"); } } @@ -67,7 +67,7 @@ void commandDR() { getCaliArray(&data_var); v_unbindArray(data_var.var); - DEBUG_COMMAND("DR %d:\n", data_var.var); + DEBUG_COMMAND("DR %d:", data_var.var); } void commandDF() { @@ -76,12 +76,12 @@ void commandDF() { int cnt = getCaliValue(); int data = getCaliValue(); - DEBUG_COMMAND("DF %p,%d,%d:\n", data_var, cnt, data); + DEBUG_COMMAND("DF %p,%d,%d:", data_var, cnt, data); if (data_var.page) { int maxlen = v_sliceSize(&data_var); if (cnt > maxlen) { - WARNING("%03d:%05x: count exceeds array boundary (%d > %d)\n", sl_getPage(), sl_getIndex(), cnt, maxlen); + WARNING("%03d:%05x: count exceeds array boundary (%d > %d)", sl_getPage(), sl_getIndex(), cnt, maxlen); cnt = maxlen; } } diff --git a/src/cmde.c b/src/cmde.c index 388a617..5c73d33 100644 --- a/src/cmde.c +++ b/src/cmde.c @@ -49,7 +49,7 @@ void commandES() { tbl[num - 1].r.h = height; tbl[num - 1].pal = pal; - DEBUG_COMMAND("ES %d,%d,%d,%d,%d,%d:\n", num, pal, x, y, width, height); + DEBUG_COMMAND("ES %d,%d,%d,%d,%d,%d:", num, pal, x, y, width, height); } void commandEC() { @@ -67,7 +67,7 @@ void commandEC() { ags_fillRectangle(e->r.x, e->r.y, e->r.w + adj, e->r.h + adj, e->pal); ags_updateArea(e->r.x, e->r.y, e->r.w + adj, e->r.h + adj); } - DEBUG_COMMAND("EC %d:\n", num); + DEBUG_COMMAND("EC %d:", num); } void commandEG() { @@ -82,7 +82,7 @@ void commandEG() { *width = tbl[num -1].r.w; *height = tbl[num -1].r.h; - DEBUG_COMMAND("EG %d,%d,%d,%d,%d:\n", num, *x, *y, *width, *height); + DEBUG_COMMAND("EG %d,%d,%d,%d,%d:", num, *x, *y, *width, *height); } void commandEM() { @@ -98,7 +98,7 @@ void commandEM() { r.h -= 1; } *var = SDL_PointInRect(&p, &r) ? 1 : 0; - DEBUG_COMMAND("EM %d,%d,%d,%d:\n", num, *var, x, y); + DEBUG_COMMAND("EM %d,%d,%d,%d:", num, *var, x, y); } void commandEN() { @@ -121,5 +121,5 @@ void commandEN() { *var = i; } - DEBUG_COMMAND("EN %d,%d,%d,%d,%d:\n", *var, min, max, x, y); + DEBUG_COMMAND("EN %d,%d,%d,%d,%d:", *var, min, max, x, y); } diff --git a/src/cmdf.c b/src/cmdf.c index 5874fda..7a1d383 100644 --- a/src/cmdf.c +++ b/src/cmdf.c @@ -80,7 +80,7 @@ static void commandF1() { int i; char *p; - DEBUG_COMMAND("F1 %d,%d:\n", str_number, skip); + DEBUG_COMMAND("F1 %d,%d:", str_number, skip); p = (char *)nact->datatbl_addr; for (i = 0; i < skip; i++) { @@ -104,7 +104,7 @@ static void commandF2() { p++; nact->datatbl_addr = (void *)p; - DEBUG_COMMAND("F2 %d,%d:\n", *read_var, skip); + DEBUG_COMMAND("F2 %d,%d:", *read_var, skip); } static void commandF3() { @@ -113,7 +113,7 @@ static void commandF3() { *read_var = LittleEndian_getW(nact->datatbl_addr, skip *2); - DEBUG_COMMAND("F3 %d,%d:\n", *read_var, skip); + DEBUG_COMMAND("F3 %d,%d:", *read_var, skip); } static void commandF4() { @@ -130,7 +130,7 @@ static void commandF4() { nact->datatbl_addr = p; - DEBUG_COMMAND("F4 %d,%d:\n", *read_var, count); + DEBUG_COMMAND("F4 %d,%d:", *read_var, count); } static void commandF5() { @@ -143,7 +143,7 @@ static void commandF5() { read_var++; } - DEBUG_COMMAND("F5 %d,%d:\n", *read_var, count); + DEBUG_COMMAND("F5 %d,%d:", *read_var, count); } static void commandF6() { @@ -152,7 +152,7 @@ static void commandF6() { F6Index[index] = var; - DEBUG_COMMAND("F6 %d,%d:\n", *var, index); + DEBUG_COMMAND("F6 %d,%d:", *var, index); } static void commandF7() { @@ -170,29 +170,29 @@ static void commandF7() { nact->datatbl_addr = p; - DEBUG_COMMAND("F7 %d,%d\n", data_width, count); + DEBUG_COMMAND("F7 %d,%d", data_width, count); } static void commandF8() { int snum = getCaliValue(); int scnt = getCaliValue(); - DEBUG_COMMAND_YET("F8 %d,%d:\n", snum, scnt); + DEBUG_COMMAND_YET("F8 %d,%d:", snum, scnt); } static void commandF9() { int snum = getCaliValue(); int scnt = getCaliValue(); - DEBUG_COMMAND_YET("F9 %d,%d:\n", snum, scnt); + DEBUG_COMMAND_YET("F9 %d,%d:", snum, scnt); } static void commandF10() { int snum = getCaliValue(); int scnt = getCaliValue(); - DEBUG_COMMAND_YET("F10 %d,%d:\n", snum, scnt); + DEBUG_COMMAND_YET("F10 %d,%d:", snum, scnt); } static void commandF11() { int snum = getCaliValue(); int ends = getCaliValue(); - DEBUG_COMMAND_YET("F11 %d,%d:\n", snum, ends); + DEBUG_COMMAND_YET("F11 %d,%d:", snum, ends); } diff --git a/src/cmdg.c b/src/cmdg.c index cee18b6..074c2f0 100644 --- a/src/cmdg.c +++ b/src/cmdg.c @@ -30,14 +30,14 @@ void commandG0() { int num = getCaliValue(); if (num == 0) { - WARNING("G0 num: num = 0!!\n"); + WARNING("G0 num: num = 0!!"); cg_clear_display_loc(); return; } cg_load(num - 1, -1); - DEBUG_COMMAND("G %d:\n",num); + DEBUG_COMMAND("G %d:",num); } void commandG1() { @@ -45,14 +45,14 @@ void commandG1() { int sprite = getCaliValue(); if (num == 0) { - WARNING("G1 num: num = 0!!\n"); + WARNING("G1 num: num = 0!!"); cg_clear_display_loc(); return; } cg_load(num - 1, sprite); - DEBUG_COMMAND("G %d,%d:\n",num,sprite); + DEBUG_COMMAND("G %d,%d:",num,sprite); } void commandGS() { @@ -62,7 +62,7 @@ void commandGS() { int *var = getCaliVariable(); if (num == 0) { - WARNING("GS num: num = 0!!\n"); + WARNING("GS num: num = 0!!"); return; } @@ -72,7 +72,7 @@ void commandGS() { var[2] = r.w; var[3] = r.h; - DEBUG_COMMAND("GS %d,%p:\n",num,var); + DEBUG_COMMAND("GS %d,%p:",num,var); } void commandGX() { @@ -80,11 +80,11 @@ void commandGX() { int shadow_num = getCaliValue(); if (shadow_num == 0) { - WARNING("GX shadow_now = 0!!\n"); + WARNING("GX shadow_now = 0!!"); return; } cg_load_with_alpha(cg_num -1, shadow_num -1); - DEBUG_COMMAND("GX %d,%d:\n",cg_num, shadow_num); + DEBUG_COMMAND("GX %d,%d:",cg_num, shadow_num); } diff --git a/src/cmdh.c b/src/cmdh.c index 283d48d..7495b5d 100644 --- a/src/cmdh.c +++ b/src/cmdh.c @@ -39,7 +39,7 @@ void commandH() { sys_addMsg(s); free(s); - DEBUG_COMMAND("H %d,%d:\n",fig,num); + DEBUG_COMMAND("H %d,%d:",fig,num); } void commandHH(void) { @@ -49,5 +49,5 @@ void commandHH(void) { sys_addMsg(format_number(num, fig, buf)); - DEBUG_COMMAND("HH %d,%d:\n",fig,num); + DEBUG_COMMAND("HH %d,%d:",fig,num); } diff --git a/src/cmdi.c b/src/cmdi.c index 7e7a66c..50eeb36 100644 --- a/src/cmdi.c +++ b/src/cmdi.c @@ -43,7 +43,7 @@ void commandIK() { int num = sl_getc(); int key; - DEBUG_COMMAND("IK %d:\n",num); + DEBUG_COMMAND("IK %d:",num); /* to be fix * IK0/1 is affected by ZI @@ -94,7 +94,7 @@ void commandIK() { sysVar[0] = sys_getInputInfo(); break; default: - WARNING("commandIK(): Unknown Command %d\n", num); + WARNING("commandIK(): Unknown Command %d", num); } } @@ -107,7 +107,7 @@ void commandIM() { sysVar[0] = sys_getMouseInfo(&p, FALSE); *x_var = p.x; *y_var = p.y; - DEBUG_COMMAND("IM %d,%d:\n", *x_var, *y_var); + DEBUG_COMMAND("IM %d,%d:", *x_var, *y_var); } void commandIC() { @@ -119,7 +119,7 @@ void commandIC() { pre = cursor_num; ags_setCursorType(cursor_num); - DEBUG_COMMAND("IC %d,%p:\n", cursor_num, oldcursor); + DEBUG_COMMAND("IC %d,%p:", cursor_num, oldcursor); } void commandIZ() { @@ -128,7 +128,7 @@ void commandIZ() { int y = getCaliValue(); ags_setCursorLocation(x, y, TRUE); - DEBUG_COMMAND("IZ %d,%d:\n", x, y); + DEBUG_COMMAND("IZ %d,%d:", x, y); } void commandIX() { @@ -136,7 +136,7 @@ void commandIX() { int *var = getCaliVariable(); *var = msgskip_isSkipping() == TRUE ? 1 : 0; - DEBUG_COMMAND("IX %p:\n",var); + DEBUG_COMMAND("IX %p:",var); } void commandIY() { @@ -152,7 +152,7 @@ void commandIY() { msgskip_setFlags(0, MSGSKIP_STOP_ON_MENU); } - DEBUG_COMMAND("IY %d:\n",p1); + DEBUG_COMMAND("IY %d:",p1); } void commandIG() { /* T2 */ @@ -167,7 +167,7 @@ void commandIG() { /* T2 */ var++; } - DEBUG_COMMAND("IG %p,%d,%d,%d\n", var, code, cnt, rsv); + DEBUG_COMMAND("IG %p,%d,%d,%d", var, code, cnt, rsv); } void commandIE() { @@ -175,5 +175,5 @@ void commandIE() { int p2 = getCaliValue(); ags_loadCursor(p1, p2); - DEBUG_COMMAND("IE %d,%d\n", p1, p2); + DEBUG_COMMAND("IE %d,%d", p1, p2); } diff --git a/src/cmdj.c b/src/cmdj.c index 5ec15c9..4d920d6 100644 --- a/src/cmdj.c +++ b/src/cmdj.c @@ -32,7 +32,7 @@ void commandJ0() { int y = getCaliValue(); cg_set_display_location(x, y, OFFSET_ABSOLUTE_GC); - DEBUG_COMMAND("J0 %d,%d:\n", x, y); + DEBUG_COMMAND("J0 %d,%d:", x, y); } void commandJ1() { @@ -40,7 +40,7 @@ void commandJ1() { int y = getCaliValue(); cg_set_display_location(x, y, OFFSET_RELATIVE_GC); - DEBUG_COMMAND("J1 %d,%d:\n", x, y); + DEBUG_COMMAND("J1 %d,%d:", x, y); } void commandJ2() { @@ -48,7 +48,7 @@ void commandJ2() { int y = getCaliValue(); cg_set_display_location(x, y, OFFSET_ABSOLUTE_JC); - DEBUG_COMMAND("J2:%d,%d\n", x, y); + DEBUG_COMMAND("J2:%d,%d", x, y); } void commandJ3() { @@ -56,10 +56,10 @@ void commandJ3() { int y = getCaliValue(); cg_set_display_location(x, y, OFFSET_RELATIVE_JC); - DEBUG_COMMAND("J3:%d,%d\n", x, y); + DEBUG_COMMAND("J3:%d,%d", x, y); } void commandJ4() { cg_set_display_location(0, 0, OFFSET_NOMOVE); - DEBUG_COMMAND("J4 :\n"); + DEBUG_COMMAND("J4 :"); } diff --git a/src/cmdk.c b/src/cmdk.c index 6a4b914..aea5890 100644 --- a/src/cmdk.c +++ b/src/cmdk.c @@ -34,7 +34,7 @@ void commandKI() { *var = network_create_channel(port_num, user_max); - DEBUG_COMMAND_YET("KI %d,%d,%d:\n", *var, port_num, user_max); + DEBUG_COMMAND_YET("KI %d,%d,%d:", *var, port_num, user_max); return; } @@ -44,7 +44,7 @@ void commandKK() { network_close(use_num); - DEBUG_COMMAND_YET("KK %d:\n", use_num); + DEBUG_COMMAND_YET("KK %d:", use_num); return; } @@ -54,7 +54,7 @@ void commandKN() { *var = network_get_channel(); - DEBUG_COMMAND_YET("KN %d:\n", *var); + DEBUG_COMMAND_YET("KN %d:", *var); return; } @@ -64,7 +64,7 @@ void commandKP() { *var = network_check_buffer(); - DEBUG_COMMAND_YET("KP %d:\n", *var); + DEBUG_COMMAND_YET("KP %d:", *var); return; } @@ -75,7 +75,7 @@ void commandKQ() { *var = network_get_user_state(user_num); - DEBUG_COMMAND_YET("KQ %d,%d:\n", *var, user_num); + DEBUG_COMMAND_YET("KQ %d,%d:", *var, user_num); return; } @@ -85,7 +85,7 @@ void commandKR() { network_read_buffer(var); - DEBUG_COMMAND_YET("KR %d:\n", *var); + DEBUG_COMMAND_YET("KR %d:", *var); return; } @@ -96,6 +96,6 @@ void commandKW() { network_write_buffer(var, num); - DEBUG_COMMAND_YET("KR %d,%d:\n", *var, num); + DEBUG_COMMAND_YET("KR %d,%d:", *var, num); return; } diff --git a/src/cmdl.c b/src/cmdl.c index 96c9078..e4a09f6 100644 --- a/src/cmdl.c +++ b/src/cmdl.c @@ -46,7 +46,7 @@ void commandLD() { } else { sysVar[0] = save_loadAll(num - 1); } - DEBUG_COMMAND("LD %d:\n",num); + DEBUG_COMMAND("LD %d:",num); } void commandLP() { @@ -61,7 +61,7 @@ void commandLP() { } else { sysVar[0] = save_loadPartial(num - 1, &point, cnt); } - DEBUG_COMMAND("LP %d,%d,%d:\n",num, point.var, cnt); + DEBUG_COMMAND("LP %d,%d,%d:",num, point.var, cnt); } void commandLT() { @@ -103,7 +103,7 @@ void commandLT() { *(var + 5) = lc->tm_sec; sysVar[0] = 0; } - DEBUG_COMMAND("LT %d,%p\n",num, var); + DEBUG_COMMAND("LT %d,%p",num, var); } void commandLE() { @@ -128,12 +128,12 @@ void commandLE() { default: var = getCaliValue(); cnt = getCaliValue(); - WARNING("Unknown LE command %d\n", type); + WARNING("Unknown LE command %d", type); break; } free(fname_utf8); - DEBUG_COMMAND("LE %d,%s,%d,%d:\n",type, filename, var, cnt); + DEBUG_COMMAND("LE %d,%s,%d,%d:",type, filename, var, cnt); } void commandLL() { @@ -158,10 +158,10 @@ void commandLL() { var = getCaliVariable(); num = getCaliValue(); - DEBUG_COMMAND("LL %d,%d,%d,%d:\n",type, link_no, _var, num); + DEBUG_COMMAND("LL %d,%d,%d,%d:",type, link_no, _var, num); if (dfile->size < num * sizeof(WORD)) { - WARNING("data shortage (link_no = %d, requested %d, loaded %d)\n", link_no, num, dfile->size/ sizeof(WORD)); + WARNING("data shortage (link_no = %d, requested %d, loaded %d)", link_no, num, dfile->size/ sizeof(WORD)); /* sysVar[0] = 254; 大嘘*/ /* return; */ num = dfile->size / sizeof(WORD); @@ -174,13 +174,13 @@ void commandLL() { case 1: _var = getCaliValue(); num = getCaliValue(); - DEBUG_COMMAND_YET("LL1 not yet %d, %d\n", _var, num); + DEBUG_COMMAND_YET("LL1 not yet %d, %d", _var, num); sysVar[0] = 255; goto out; break; default: - WARNING("Unknown LL command %d\n", type); + WARNING("Unknown LL command %d", type); goto out; } @@ -197,7 +197,7 @@ void commandLHD() { // X版では全てをHDDに置くのでサポートしない sysVar[0] = 255; - DEBUG_COMMAND("LHD %d,%d:\n",p1,no); + DEBUG_COMMAND("LHD %d,%d:",p1,no); } void commandLHG() { @@ -221,7 +221,7 @@ void commandLHG() { sysVar[0] = (no == last_registered) ? 1 : 0; break; } - DEBUG_COMMAND("LHG %d,%d:\n",p1,no); + DEBUG_COMMAND("LHG %d,%d:",p1,no); } void commandLHM() { @@ -231,7 +231,7 @@ void commandLHM() { // X版では全てをHDDに置くのでサポートしない sysVar[0] = 255; - DEBUG_COMMAND("LHM %d,%d:\n",p1,no); + DEBUG_COMMAND("LHM %d,%d:",p1,no); } void commandLHS() { @@ -241,7 +241,7 @@ void commandLHS() { // X版では全てをHDDに置くのでサポートしない sysVar[0] = 255; - DEBUG_COMMAND("LHS %d,%d:\n",p1,no); + DEBUG_COMMAND("LHS %d,%d:",p1,no); } void commandLHW() { @@ -251,7 +251,7 @@ void commandLHW() { // X版では全てをHDDに置くのでサポートしない sysVar[0] = 255; - DEBUG_COMMAND("LHW %d,%d:\n",p1,no); + DEBUG_COMMAND("LHW %d,%d:",p1,no); } void commandLC() { @@ -263,7 +263,7 @@ void commandLC() { sysVar[0] = cg_load_with_filename(fname_utf8, x, y); free(fname_utf8); - DEBUG_COMMAND("LC %d,%d,%s:\n", x, y, filename); + DEBUG_COMMAND("LC %d,%d,%s:", x, y, filename); } void commandLXG() { @@ -272,7 +272,7 @@ void commandLXG() { const char *title = sl_getString(':'); const char *filter = sl_getString(':'); - DEBUG_COMMAND_YET("LXG %d,%s,%s:\n", file_name, title, filter); + DEBUG_COMMAND_YET("LXG %d,%s,%s:", file_name, title, filter); } void commandLXO() { @@ -282,14 +282,14 @@ void commandLXO() { int how_to_create = getCaliValue(); sysVar[0]=255; - DEBUG_COMMAND_YET("LXO %d,%d,%d:\n",num,file_name,how_to_create); + DEBUG_COMMAND_YET("LXO %d,%d,%d:",num,file_name,how_to_create); } void commandLXC() { /* ファイルをクローズする */ int num = getCaliValue(); - DEBUG_COMMAND_YET("LXC %d:\n",num); + DEBUG_COMMAND_YET("LXC %d:",num); } void commandLXL() { @@ -298,7 +298,7 @@ void commandLXL() { int y = getCaliValue(); int file_name = getCaliValue(); - DEBUG_COMMAND_YET("LXL %d,%d,%d:\n",x,y,file_name); + DEBUG_COMMAND_YET("LXL %d,%d,%d:",x,y,file_name); } void commandLXS() { @@ -307,7 +307,7 @@ void commandLXS() { int *hi = getCaliVariable(); int *lo = getCaliVariable(); - DEBUG_COMMAND_YET("LXS %d,%d,%d:\n", num, *hi, *lo); + DEBUG_COMMAND_YET("LXS %d,%d,%d:", num, *hi, *lo); } void commandLXP() { @@ -316,7 +316,7 @@ void commandLXP() { int hi = getCaliValue(); int lo = getCaliValue(); - DEBUG_COMMAND_YET("LXP %d,%d,%d:\n",num,hi,lo); + DEBUG_COMMAND_YET("LXP %d,%d,%d:",num,hi,lo); } void commandLXR() { @@ -325,7 +325,7 @@ void commandLXR() { int *var = getCaliVariable(); int size = getCaliValue(); - DEBUG_COMMAND_YET("LXR %d,%d,%d:\n",num,*var,size); + DEBUG_COMMAND_YET("LXR %d,%d,%d:",num,*var,size); } void commandLXW() { @@ -334,5 +334,5 @@ void commandLXW() { int *var = getCaliVariable(); int size = getCaliValue(); - DEBUG_COMMAND_YET("LXW %d,%d,%d:\n",num,*var,size); + DEBUG_COMMAND_YET("LXW %d,%d,%d:",num,*var,size); } diff --git a/src/cmdm.c b/src/cmdm.c index 15c4ea9..8ec3f41 100644 --- a/src/cmdm.c +++ b/src/cmdm.c @@ -53,7 +53,7 @@ void commandMS() { const char *str = sl_getString(':'); svar_set(num, str); - DEBUG_COMMAND("MS %d,%s:\n",num,str); + DEBUG_COMMAND("MS %d,%s:",num,str); } void commandMP() { @@ -94,7 +94,7 @@ void commandMP() { } sys_addMsg(str); - DEBUG_COMMAND("MP %d,%d:\n",num1,num2); + DEBUG_COMMAND("MP %d,%d:",num1,num2); free(str); } @@ -127,7 +127,7 @@ void commandMI() { /* T2 */ free(t1); free(t2); free(t3); - DEBUG_COMMAND("MI %d,%d,%s:\n",dst_no,max_len, title); + DEBUG_COMMAND("MI %d,%d,%s:",dst_no,max_len, title); } void commandMA() { @@ -143,7 +143,7 @@ void commandMA() { svar_append(num1, svar_get(num2)); } - DEBUG_COMMAND("MA %d,%d:\n",num1,num2); + DEBUG_COMMAND("MA %d,%d:",num1,num2); } void commandMC() { @@ -153,7 +153,7 @@ void commandMC() { sysVar[0] = strcmp(svar_get(num1), svar_get(num2)) == 0 ? 1 : 0; - DEBUG_COMMAND("MC %d,%d:\n",num1,num2); + DEBUG_COMMAND("MC %d,%d:",num1,num2); } void commandMT() { @@ -175,7 +175,7 @@ void commandMT() { Y3waitFlags = KEYWAIT_NONCANCELABLE; } - DEBUG_COMMAND("MT %s:\n",str); + DEBUG_COMMAND("MT %s:",str); } void commandMM() { @@ -186,7 +186,7 @@ void commandMM() { if (num1 != num2) svar_set(num1, svar_get(num2)); - DEBUG_COMMAND("MM %d,%d:\n",num1, num2); + DEBUG_COMMAND("MM %d,%d:",num1, num2); } void commandMH() { @@ -200,7 +200,7 @@ void commandMH() { svar_set(num1, s); free(s); - DEBUG_COMMAND("MH %d,%d,%d:\n",num1,fig,num2); + DEBUG_COMMAND("MH %d,%d,%d:",num1,fig,num2); } void commandMV() { @@ -208,7 +208,7 @@ void commandMV() { int version = getCaliValue(); nact->scenario_version = version; - DEBUG_COMMAND("MV %d:\n",version); + DEBUG_COMMAND("MV %d:",version); } void commandML() { @@ -218,7 +218,7 @@ void commandML() { *var = svar_length(str_no); - DEBUG_COMMAND("ML %p,%d:\n",var, str_no); + DEBUG_COMMAND("ML %p,%d:",var, str_no); } void commandMD() { @@ -229,7 +229,7 @@ void commandMD() { svar_copy(dst_str_no, 0, src_str_no, 0, len); - DEBUG_COMMAND("MD %d,%d,%d:\n",dst_str_no, src_str_no, len); + DEBUG_COMMAND("MD %d,%d,%d:",dst_str_no, src_str_no, len); } void commandME() { @@ -242,7 +242,7 @@ void commandME() { svar_copy(dst_str_no, dst_pos, src_str_no, src_pos, len); - DEBUG_COMMAND("ME %d,%d,%d,%d,%d:\n",dst_str_no, dst_pos, src_str_no, src_pos, len); + DEBUG_COMMAND("ME %d,%d,%d,%d,%d:",dst_str_no, dst_pos, src_str_no, src_pos, len); } void commandMF() { @@ -261,7 +261,7 @@ void commandMF() { sysVar[0] = 0; } - DEBUG_COMMAND("MF %p,%d,%d,%d:\n",var, dst_no, key_no, start_pos); + DEBUG_COMMAND("MF %p,%d,%d,%d:",var, dst_no, key_no, start_pos); } void commandMZ0() { @@ -270,7 +270,7 @@ void commandMZ0() { int max_num = getCaliValue(); int rsv = getCaliValue(); - DEBUG_COMMAND("MZ0 %d,%d,%d:\n",max_len, max_num, rsv); + DEBUG_COMMAND("MZ0 %d,%d,%d:",max_len, max_num, rsv); /* いつからか、文字列変数の最大長さは∞になったようだ */ if (max_len == 0) max_len = STRVAR_LEN * 2; @@ -322,11 +322,11 @@ void commandMG() { break; default: sw = getCaliValue(); - WARNING("Unknown MG command %d,%d\n", no, sw); + WARNING("Unknown MG command %d,%d", no, sw); break; } - DEBUG_COMMAND("MG %d,%d:\n",no, sw); + DEBUG_COMMAND("MG %d,%d:",no, sw); } void commandMJ() { @@ -355,7 +355,7 @@ void commandMJ() { free(t1); free(t2); - DEBUG_COMMAND("MJ %d,%d,%d,%d,%d:\n", num, x, y, h, max_len); + DEBUG_COMMAND("MJ %d,%d,%d,%d,%d:", num, x, y, h, max_len); } void commandMN() { @@ -373,7 +373,7 @@ void commandMN() { svar_fromVars(num, var); break; default: - WARNING("UnKnown MN command(%d)\n", no); + WARNING("UnKnown MN command(%d)", no); } - DEBUG_COMMAND("MN %d,%d,%d:\n",no, num, *var); + DEBUG_COMMAND("MN %d,%d,%d:",no, num, *var); } diff --git a/src/cmdn.c b/src/cmdn.c index 49953bd..aa3a16c 100644 --- a/src/cmdn.c +++ b/src/cmdn.c @@ -42,16 +42,16 @@ void commandNB() { int cnt = getCaliValue(); if (var1 == NULL) { - WARNING("NB dst variable(var1) is NULL\n"); + WARNING("NB dst variable(var1) is NULL"); return; } if (var2 == NULL) { - WARNING("NB src variable(var2) is NULL\n"); + WARNING("NB src variable(var2) is NULL"); return; } - DEBUG_COMMAND("NB %d,%d,%d:\n", *var1, *var2, cnt); + DEBUG_COMMAND("NB %d,%d,%d:", *var1, *var2, cnt); while(cnt--) { *var1 = *var2; var1++; var2++; } @@ -62,7 +62,7 @@ void commandNC() { int *var1 = getCaliVariable(); int cnt = getCaliValue(); - DEBUG_COMMAND("NC %d,%d:\n", *var1, cnt); + DEBUG_COMMAND("NC %d,%d:", *var1, cnt); while(cnt--) { *var1++ = 0; @@ -76,7 +76,7 @@ void commandNR() { int *var2 = getCaliVariable(); *var2 = (int)sqrt(var1); - DEBUG_COMMAND("NR %d,%d:\n", var1, *var2); + DEBUG_COMMAND("NR %d,%d:", var1, *var2); } void commandN_ADD() { @@ -85,7 +85,7 @@ void commandN_ADD() { int num = getCaliValue(); int cnt = getCaliValue(); - DEBUG_COMMAND("N+ %d,%d,%d:\n", *var1, num, cnt); + DEBUG_COMMAND("N+ %d,%d,%d:", *var1, num, cnt); while(cnt--) { *var1 = (int)((WORD)(*var1 + num)) ; var1++; // *var1 += num; var1++; @@ -98,7 +98,7 @@ void commandN_SUB() { int num = getCaliValue(); int cnt = getCaliValue(); - DEBUG_COMMAND("N- %d,%d,%d:\n", *var1, num, cnt); + DEBUG_COMMAND("N- %d,%d,%d:", *var1, num, cnt); while(cnt--) { *var1 = max(0, *var1 - num); var1++; // *var1 -= num; var1++; @@ -111,7 +111,7 @@ void commandN_MUL() { int num = getCaliValue(); int cnt = getCaliValue(); - DEBUG_COMMAND("N* %d,%d,%d:\n", *var1, num, cnt); + DEBUG_COMMAND("N* %d,%d,%d:", *var1, num, cnt); while(cnt--) { *var1 = (int)((WORD)(*var1 * num)); var1++; // *var1 *= num; var1++; @@ -124,7 +124,7 @@ void commandN_DIV() { int num = getCaliValue(); int cnt = getCaliValue(); - DEBUG_COMMAND("N/ %d,%d,%d:\n", *var1, num, cnt); + DEBUG_COMMAND("N/ %d,%d,%d:", *var1, num, cnt); while(cnt--) { // *var1 = (unsigned short)(*var1)/num; var1++; *var1 /= num; var1++; @@ -140,7 +140,7 @@ void commandN_GT() { int cnt = getCaliValue(); int *var2 = getCaliVariable(); - DEBUG_COMMAND("N> %d,%d,%d,%d:\n", *var1, num, cnt, *var2); + DEBUG_COMMAND("N> %d,%d,%d,%d:", *var1, num, cnt, *var2); while (cnt--) { *var2 = *var1 > num ? 1 : 0; var1++; var2++; } @@ -155,7 +155,7 @@ void commandN_LT() { int cnt = getCaliValue(); int *var2 = getCaliVariable(); - DEBUG_COMMAND("N< %p,%d,%d,%p:\n", var1, num, cnt, var2); + DEBUG_COMMAND("N< %p,%d,%d,%p:", var1, num, cnt, var2); while(cnt--) { *var2 = *var1 < num ? 1 : 0; var1++; var2++; } @@ -170,7 +170,7 @@ void commandN_EQ() { int cnt = getCaliValue(); int *var2 = getCaliVariable(); - DEBUG_COMMAND("N= %p,%d,%d,%p:\n", var1, num, cnt, var2); + DEBUG_COMMAND("N= %p,%d,%d,%p:", var1, num, cnt, var2); while(cnt--) { *var2 = *var1 == num ? 1 : 0; var1++; var2++; } @@ -181,7 +181,7 @@ void commandN_NE() { int *var1 = getCaliVariable(); int cnt = getCaliValue(); - DEBUG_COMMAND("N\\ %p,%d:\n", var1, cnt); + DEBUG_COMMAND("N\\ %p,%d:", var1, cnt); while(cnt--) { *var1 ^= 1; var1++; } @@ -193,7 +193,7 @@ void commandN_AND() { int cnt = getCaliValue(); int *var2 = getCaliVariable(); - DEBUG_COMMAND("N& %p,%d,%p:\n", var1, cnt, var2); + DEBUG_COMMAND("N& %p,%d,%p:", var1, cnt, var2); while(cnt--) { *var2 &= *var1; var1++; var2++; } @@ -205,7 +205,7 @@ void commandN_OR() { int cnt = getCaliValue(); int *var2 = getCaliVariable(); - DEBUG_COMMAND("N| %p,%d,%p:\n", var1, cnt, var2); + DEBUG_COMMAND("N| %p,%d,%p:", var1, cnt, var2); while(cnt--) { *var2 |= *var1; var1++; var2++; } @@ -217,7 +217,7 @@ void commandN_XOR() { int cnt = getCaliValue(); int *var2 = getCaliVariable(); - DEBUG_COMMAND("N^ %p,%d,%p:\n", var1, cnt, var2); + DEBUG_COMMAND("N^ %p,%d,%p:", var1, cnt, var2); while(cnt--) { *var2 ^= *var1; var1++; var2++; } @@ -228,7 +228,7 @@ void commandN_NOT() { int *var = getCaliVariable(); int cnt = getCaliValue(); - DEBUG_COMMAND("N~ %p,%d\n", var, cnt); + DEBUG_COMMAND("N~ %p,%d", var, cnt); while(cnt--) { *var ^= 0xffff; var++; } @@ -259,10 +259,10 @@ void commandNO() { /* T2 */ *dst_var = (tmp & (1 << (15 - (i%16)))) ? 1 : 0; dst_var++; } } else { - WARNING("Unknown NO %d command\n", p1); + WARNING("Unknown NO %d command", p1); } - DEBUG_COMMAND("NO %d,%p,%p,%d:\n", p1, src_var, dst_var, cnt); + DEBUG_COMMAND("NO %d,%p,%p,%d:", p1, src_var, dst_var, cnt); } void commandNDC() { @@ -271,7 +271,7 @@ void commandNDC() { int num = getCaliValue(); longVar[w64n] = num; - DEBUG_COMMAND("NDC %d,%d:\n", w64n, num); + DEBUG_COMMAND("NDC %d,%d:", w64n, num); } void commandNDD() { @@ -280,7 +280,7 @@ void commandNDD() { int w64n = getCaliValue(); *var = (int)longVar[w64n]; - DEBUG_COMMAND("NDD %p,%d:\n", var, w64n); + DEBUG_COMMAND("NDD %p,%d:", var, w64n); } void commandNDM() { @@ -288,7 +288,7 @@ void commandNDM() { int str = getCaliValue(); int w64n = getCaliValue(); - DEBUG_COMMAND_YET("NDM %d,%d:\n", str, w64n); + DEBUG_COMMAND_YET("NDM %d,%d:", str, w64n); } void commandNDA() { @@ -296,7 +296,7 @@ void commandNDA() { int str = getCaliValue(); int w64n = getCaliValue(); - DEBUG_COMMAND_YET("NDA %d,%d:\n", str, w64n); + DEBUG_COMMAND_YET("NDA %d,%d:", str, w64n); } void commandNDH() { @@ -304,7 +304,7 @@ void commandNDH() { int str = getCaliValue(); int w64n = getCaliValue(); - DEBUG_COMMAND_YET("NDH %d,%d:\n", str, w64n); + DEBUG_COMMAND_YET("NDH %d,%d:", str, w64n); } void commandND_ADD() { @@ -315,7 +315,7 @@ void commandND_ADD() { longVar[w64n1] = longVar[w64n2] + longVar[w64n3]; - DEBUG_COMMAND("ND+ %d,%d,%d:\n", w64n1, w64n2); + DEBUG_COMMAND("ND+ %d,%d,%d:", w64n1, w64n2); } void commandND_SUB() { @@ -326,7 +326,7 @@ void commandND_SUB() { longVar[w64n1] = longVar[w64n2] - longVar[w64n3]; - DEBUG_COMMAND("ND- %d,%d,%d:\n", w64n1, w64n2, w64n3); + DEBUG_COMMAND("ND- %d,%d,%d:", w64n1, w64n2, w64n3); } void commandND_MUL() { @@ -337,7 +337,7 @@ void commandND_MUL() { longVar[w64n1] = longVar[w64n2] * longVar[w64n3]; - DEBUG_COMMAND("ND* %d,%d,%d:\n", w64n1, w64n2, w64n3); + DEBUG_COMMAND("ND* %d,%d,%d:", w64n1, w64n2, w64n3); } void commandND_DIV() { @@ -348,7 +348,7 @@ void commandND_DIV() { longVar[w64n1] = longVar[w64n2] / longVar[w64n3]; - DEBUG_COMMAND("ND/ %d,%d,%d:\n", w64n1, w64n2, w64n3); + DEBUG_COMMAND("ND/ %d,%d,%d:", w64n1, w64n2, w64n3); } void commandNI() { /* From Panyo */ @@ -373,7 +373,7 @@ void commandNI() { /* From Panyo */ sysVar[0] = 0; } - DEBUG_COMMAND("NI %p,%d,%d,%d:\n", var, def, _min, _max); + DEBUG_COMMAND("NI %p,%d,%d,%d:", var, def, _min, _max); } void commandNT() { /* From Panyo */ @@ -383,7 +383,7 @@ void commandNT() { /* From Panyo */ free(ni_param.title); ni_param.title = toUTF8(str); - DEBUG_COMMAND("NT %p:\n", str); + DEBUG_COMMAND("NT %p:", str); } void commandNP() { @@ -393,7 +393,7 @@ void commandNP() { int count = getCaliValue(); int *result = getCaliVariable(); - DEBUG_COMMAND("NP %d,%d,%d,%d:\n", *var1, *var2, count, *result); + DEBUG_COMMAND("NP %d,%d,%d,%d:", *var1, *var2, count, *result); while(count--) { if (*var1 != *var2) { diff --git a/src/cmdp.c b/src/cmdp.c index 07f6e62..722c6ac 100644 --- a/src/cmdp.c +++ b/src/cmdp.c @@ -32,7 +32,7 @@ void commandPN() { /* num 番のＣＧを表示する時、カラーパレットを展開しないようにする。*/ int num = getCaliValue(); - DEBUG_COMMAND_YET("PN %d:\n",num); + DEBUG_COMMAND_YET("PN %d:",num); } void commandPF() { @@ -60,7 +60,7 @@ void commandPF() { sysVar[0] = nact->waitcancel_key; break; } - DEBUG_COMMAND("PF %d,%d,%d:\n", p1, num, cancel_enabled); + DEBUG_COMMAND("PF %d,%d,%d:", p1, num, cancel_enabled); } void commandPW() { @@ -88,7 +88,7 @@ void commandPW() { sysVar[0] = nact->waitcancel_key; break; } - DEBUG_COMMAND("PW %d,%d,%d:\n", p1, num, cancel_enabled); + DEBUG_COMMAND("PW %d,%d,%d:", p1, num, cancel_enabled); } void commandPS() { @@ -101,7 +101,7 @@ void commandPS() { ags_setPalette(Plane, Red, Green, Blue); ags_setPaletteToSystem(Plane, 1); - DEBUG_COMMAND("PS %d,%d,%d,%d:\n", Plane, Red, Green, Blue); + DEBUG_COMMAND("PS %d,%d,%d,%d:", Plane, Red, Green, Blue); } void commandPG() { /* T2 */ @@ -116,7 +116,7 @@ void commandPG() { /* T2 */ *var = nact->ags.pal->green[num1 + i]; var++; *var = nact->ags.pal->blue[num1 + i]; var++; } - DEBUG_COMMAND("PG %p,%d,%d:\n", var, num1, num2); + DEBUG_COMMAND("PG %p,%d,%d:", var, num1, num2); } void commandPP() { /* T2 */ @@ -130,7 +130,7 @@ void commandPP() { /* T2 */ ags_setPalette(num1 + i, *var, *(var +1), *(var +2)); var+=3; } ags_setPaletteToSystem(num1, num2); - DEBUG_COMMAND("PP %p,%d,%d:\n", var, num1, num2); + DEBUG_COMMAND("PP %p,%d,%d:", var, num1, num2); } void commandPC() { @@ -139,7 +139,7 @@ void commandPC() { cg_fflg = num; - DEBUG_COMMAND("PC %d:\n",num); + DEBUG_COMMAND("PC %d:",num); } void commandPD() { @@ -148,7 +148,7 @@ void commandPD() { cg_brightness = num; - DEBUG_COMMAND("PD %d:\n",num); + DEBUG_COMMAND("PD %d:",num); } void commandPT0() { @@ -161,7 +161,7 @@ void commandPT0() { ags_getPixel(x, y, &cell); *var = cell.pixel; - DEBUG_COMMAND("PT0 %p,%d,%d:\n", var, x, y); + DEBUG_COMMAND("PT0 %p,%d,%d:", var, x, y); } void commandPT1() { @@ -178,7 +178,7 @@ void commandPT1() { *g_var = cell.g; *b_var = cell.b; - DEBUG_COMMAND("PT1 %p,%p,%p,%d,%d:\n", r_var, g_var, b_var, x, y); + DEBUG_COMMAND("PT1 %p,%p,%p,%d,%d:", r_var, g_var, b_var, x, y); } void commandPT2() { @@ -200,5 +200,5 @@ void commandPT2() { *hi_var = pic >> 8; *low_var = pic & 0xff; - DEBUG_COMMAND("PT2 %p,%p,%d,%d:\n", hi_var, low_var, x, y); + DEBUG_COMMAND("PT2 %p,%p,%d,%d:", hi_var, low_var, x, y); } diff --git a/src/cmdq.c b/src/cmdq.c index 8b30a75..5eb692f 100644 --- a/src/cmdq.c +++ b/src/cmdq.c @@ -31,7 +31,7 @@ #include "utfsjis.h" #define WARN_SAVEERR(cmd, st) \ -if (st > 200) fprintf(stderr, "WARNING: Fail to save (cmd=%s, stat=%d)\n", cmd, st) +if (st > 200) fprintf(stderr, "WARNING: Fail to save (cmd=%s, stat=%d)", cmd, st) void commandQD() { /* 変数領域などのデータをセーブする。（全セーブ）*/ @@ -45,7 +45,7 @@ void commandQD() { WARN_SAVEERR("QD", sysVar[0]); - DEBUG_COMMAND("QD %d:\n",num); + DEBUG_COMMAND("QD %d:",num); } void commandQP() { @@ -63,7 +63,7 @@ void commandQP() { WARN_SAVEERR("QP", sysVar[0]); - DEBUG_COMMAND("QP %d,%d,%d:\n", num, point.var, cnt); + DEBUG_COMMAND("QP %d,%d,%d:", num, point.var, cnt); } void commandQC() { @@ -79,7 +79,7 @@ void commandQC() { WARN_SAVEERR("QC", sysVar[0]); - DEBUG_COMMAND("QC %d,%d:\n",num1,num2); + DEBUG_COMMAND("QC %d,%d:",num1,num2); } void commandQE() { @@ -104,11 +104,11 @@ void commandQE() { default: var = getCaliValue(); cnt = getCaliValue(); - WARNING("Unknown QE command %d\n", type); + WARNING("Unknown QE command %d", type); break; } free(fname_utf8); WARN_SAVEERR("QE", sysVar[0]); - DEBUG_COMMAND("QE %d,%s,%d,%d:\n", type, filename, var, cnt); + DEBUG_COMMAND("QE %d,%s,%d,%d:", type, filename, var, cnt); } diff --git a/src/cmds.c b/src/cmds.c index 603e805..0c8da37 100644 --- a/src/cmds.c +++ b/src/cmds.c @@ -38,7 +38,7 @@ void commandSS() { /* 音楽演奏を開始する（ＣＤのみ）*/ int num = getCaliValue(); - DEBUG_COMMAND("SS %d:\n",num); + DEBUG_COMMAND("SS %d:",num); if (num == 0) { mus_cdrom_stop(); @@ -66,7 +66,7 @@ void commandSC() { *var++ = 999; } - DEBUG_COMMAND("SC %p:\n",var); + DEBUG_COMMAND("SC %p:",var); } void commandSD() { @@ -74,7 +74,7 @@ void commandSD() { int num1 = getCaliValue(); int num2 = getCaliValue(); - DEBUG_COMMAND_YET("SD %d,%d:\n",num1,num2); + DEBUG_COMMAND_YET("SD %d,%d:",num1,num2); } void commandSR() { @@ -113,7 +113,7 @@ void commandSR() { *var = st.play_no; } - DEBUG_COMMAND("SR %d,%p:\n",num, var); + DEBUG_COMMAND("SR %d,%p:",num, var); } void commandSL() { @@ -122,7 +122,7 @@ void commandSL() { next_cdrom_loopcnt = num; - DEBUG_COMMAND("SL %d:\n",num); + DEBUG_COMMAND("SL %d:",num); } void commandSI() { @@ -138,7 +138,7 @@ void commandSI() { *var = mus_cdrom_get_state() == TRUE ? 1 : 0; } - DEBUG_COMMAND("SI %d,%d:\n",type,*var); + DEBUG_COMMAND("SI %d,%d:",type,*var); } void commandSG() { @@ -153,7 +153,7 @@ void commandSG() { /* 演奏中のＭＩＤＩを停止する */ num = getCaliValue(); mus_midi_stop(); - DEBUG_COMMAND("SG0 %d:\n", num); + DEBUG_COMMAND("SG0 %d:", num); break; case 1: /* ＭＩＤＩを演奏する */ @@ -163,14 +163,14 @@ void commandSG() { } else { mus_midi_start(num, loopcnt); } - DEBUG_COMMAND("SG1 %d:\n", num); + DEBUG_COMMAND("SG1 %d:", num); break; case 2: /* ＭＩＤＩ演奏位置を1/100秒単位で取得する */ var = getCaliVariable(); mus_midi_get_playposition(&st); *var = st.loc_ms / 10; - DEBUG_COMMAND("SG2 %p:\n", var); + DEBUG_COMMAND("SG2 %p:", var); break; case 3: num = getCaliValue(); @@ -181,40 +181,40 @@ void commandSG() { /* 一時停止中のＭＩＤＩの一時停止を解除する */ mus_midi_unpause(); } - DEBUG_COMMAND("SG3 %d:\n", num); + DEBUG_COMMAND("SG3 %d:", num); break; case 4: num = getCaliValue(); /* 次のSG1コマンドでのMIDI演奏の繰り返し回数指定 */ loopcnt = num; - DEBUG_COMMAND("SG4 %d:\n", num); + DEBUG_COMMAND("SG4 %d:", num); break; case 5: fnum = getCaliValue() & 0x7f; num = getCaliValue(); mus_midi_set_flag(0, fnum, num); - DEBUG_COMMAND("SG5 %d,%d:\n", fnum, num); + DEBUG_COMMAND("SG5 %d,%d:", fnum, num); break; case 6: fnum = getCaliValue() & 0x7f; num = getCaliValue(); mus_midi_set_flag(1, fnum, num); - DEBUG_COMMAND("SG6 %d,%d:\n", fnum, num); + DEBUG_COMMAND("SG6 %d,%d:", fnum, num); break; case 7: fnum = getCaliValue() & 0x7f; var = getCaliVariable(); *var = mus_midi_get_flag(0, fnum); - DEBUG_COMMAND("SG7 %d,%d:\n", fnum, *var); + DEBUG_COMMAND("SG7 %d,%d:", fnum, *var); break; case 8: { fnum = getCaliValue() & 0x7f; var = getCaliVariable(); *var = mus_midi_get_flag(1, fnum); - DEBUG_COMMAND("SG8 %d,%p:\n", fnum, var); + DEBUG_COMMAND("SG8 %d,%p:", fnum, var); break; } default: @@ -228,7 +228,7 @@ void commandSP() { int no = getCaliValue(); int loop = getCaliValue(); - DEBUG_COMMAND("SP %d,%d:\n",no,loop); + DEBUG_COMMAND("SP %d,%d:",no,loop); if (!mus_pcm_get_state()) { dummy_pcm_in_play = TRUE; @@ -246,7 +246,7 @@ void commandST() { /* ＰＣＭデータの演奏を停止する。 */ int time = getCaliValue(); - DEBUG_COMMAND("ST %d:\n",time); + DEBUG_COMMAND("ST %d:",time); if (!mus_pcm_get_state()) { dummy_pcm_in_play = FALSE; @@ -277,7 +277,7 @@ void commandSU() { *var1 = *var2 = 0; } - DEBUG_COMMAND("SU %d,%d:\n",*var1, *var2); + DEBUG_COMMAND("SU %d,%d:",*var1, *var2); } void commandSQ() { @@ -286,7 +286,7 @@ void commandSQ() { int noR = getCaliValue(); int loop = getCaliValue(); - DEBUG_COMMAND("SQ %d,%d,%d:\n", noL, noR, loop); + DEBUG_COMMAND("SQ %d,%d,%d:", noL, noR, loop); if (!mus_pcm_get_state()) { dummy_pcm_in_play = TRUE; @@ -304,7 +304,7 @@ void commandSO() { // ＰＣＭデバイスのサポート情報を取得 int *var = getCaliVariable(); - DEBUG_COMMAND_YET("SO %p:\n",var); + DEBUG_COMMAND_YET("SO %p:",var); } void commandSW() { @@ -329,13 +329,13 @@ void commandSW() { *var = 0; } - DEBUG_COMMAND("SW %p,%d,%d,%d:\n",var, channel, Srate, bit); + DEBUG_COMMAND("SW %p,%d,%d,%d:",var, channel, Srate, bit); } void commandSM() { /* ＰＣＭデータをメモリ上に乗せる。*/ int no = getCaliValue(); - DEBUG_COMMAND("SM %d:\n",no); + DEBUG_COMMAND("SM %d:",no); mus_pcm_load(no); } @@ -351,7 +351,7 @@ void commandSX() { int volume = getCaliValue(); int stop = getCaliValue(); mus_mixer_fadeout_start(device, time, volume, stop); - DEBUG_COMMAND("SX %d,%d,%d,%d,%d:\n", device, sw, time, volume, stop); + DEBUG_COMMAND("SX %d,%d,%d,%d,%d:", device, sw, time, volume, stop); break; } case 2: { @@ -360,20 +360,20 @@ void commandSX() { boolean st; st = mus_mixer_fadeout_get_state(device); *var = (st ? 0 : 1); - DEBUG_COMMAND("SX %d,%d:\n", device, sw); + DEBUG_COMMAND("SX %d,%d:", device, sw); break; } case 3: { /* フェード強制終了 */ mus_mixer_fadeout_stop(device); - DEBUG_COMMAND("SX %d,%d:\n", device, sw); + DEBUG_COMMAND("SX %d,%d:", device, sw); break; } case 4: { /* ボリューム取得 */ int *var = getCaliVariable(); *var = mus_mixer_get_level(device); - DEBUG_COMMAND("SX %d,%d:\n", device, sw); + DEBUG_COMMAND("SX %d,%d:", device, sw); break; } default: diff --git a/src/cmdt.c b/src/cmdt.c index e781f0a..90e0eaa 100644 --- a/src/cmdt.c +++ b/src/cmdt.c @@ -33,5 +33,5 @@ void commandT() { int y = getCaliValue(); msg_setMessageLocation(x, y); - DEBUG_COMMAND("T %d,%d:\n",x,y); + DEBUG_COMMAND("T %d,%d:",x,y); } diff --git a/src/cmdu.c b/src/cmdu.c index 182ff33..b8192c5 100644 --- a/src/cmdu.c +++ b/src/cmdu.c @@ -41,7 +41,7 @@ void commandUC() { /* 王道勇者 */ default: break; } - DEBUG_COMMAND("UC %d,%d:\n",mode,num); + DEBUG_COMMAND("UC %d,%d:",mode,num); } void commandUD() { @@ -53,17 +53,17 @@ void commandUD() { case 1: sl_retFar2(); break; default: - WARNING("UnKnown UD command %d\n", mode); + WARNING("UnKnown UD command %d", mode); } - DEBUG_COMMAND("UD %d:\n",mode); + DEBUG_COMMAND("UD %d:",mode); } void commandUR() { /* 最後に積まれたスタックの属性をリード */ int *var = getCaliVariable(); - DEBUG_COMMAND_YET("UR %p:\n",var); + DEBUG_COMMAND_YET("UR %p:",var); } void commandUS() { @@ -73,7 +73,7 @@ void commandUS() { int cnt = getCaliValue(); sl_pushVar(&vref, cnt); - DEBUG_COMMAND("US %d,%d:\n", vref.var, cnt); + DEBUG_COMMAND("US %d,%d:", vref.var, cnt); } void commandUG() { @@ -83,7 +83,7 @@ void commandUG() { int cnt = getCaliValue(); sl_popVar(&vref, cnt); - DEBUG_COMMAND("UG %p,%d:\n", vref.var, cnt); + DEBUG_COMMAND("UG %p,%d:", vref.var, cnt); } void commandUP0() { @@ -91,7 +91,7 @@ void commandUP0() { int no = getCaliValue(); int mode = getCaliValue(); - DEBUG_COMMAND_YET("UP0 %d,%d:\n",no,mode); + DEBUG_COMMAND_YET("UP0 %d,%d:",no,mode); } void commandUP1() { @@ -99,7 +99,7 @@ void commandUP1() { const char *str = sl_getString(':'); int mode = getCaliValue(); - DEBUG_COMMAND_YET("UP1 %s,%d:\n",str,mode); + DEBUG_COMMAND_YET("UP1 %s,%d:",str,mode); } void commandUP3() { @@ -107,5 +107,5 @@ void commandUP3() { const char *str1 = sl_getString(':'); const char *str2 = sl_getString(':'); - DEBUG_COMMAND_YET("UP3 %s,%s:\n",str1,str2); + DEBUG_COMMAND_YET("UP3 %s,%s:",str1,str2); } diff --git a/src/cmdv.c b/src/cmdv.c index 408ceac..b157e15 100644 --- a/src/cmdv.c +++ b/src/cmdv.c @@ -148,7 +148,7 @@ void commandVC() { /* from Rance4 */ cxUnit = getCaliValue(); cyUnit = getCaliValue(); - DEBUG_COMMAND("VC %d,%d,%d,%d,%d,%d,%d:\n",nPageNum, x0Map, y0Map, cxMap, cyMap, cxUnit, cyUnit); + DEBUG_COMMAND("VC %d,%d,%d,%d,%d,%d,%d:",nPageNum, x0Map, y0Map, cxMap, cyMap, cxUnit, cyUnit); if (NULL != UnitMap ) { free(UnitMap); @@ -158,7 +158,7 @@ void commandVC() { /* from Rance4 */ } if (nPageNum > UNITMAP_DISPLAY_PAGE_MAX) { - WARNING("VC nPageNum too big %d\n", nPageNum); + WARNING("VC nPageNum too big %d", nPageNum); sysVar[0] = 0; return; } @@ -186,10 +186,10 @@ void commandVP() { /* from T2 */ int nyUnit = getCaliValue(); int bSpCol = getCaliValue(); - DEBUG_COMMAND("VP %d,%d,%d,%d,%d,%d:\n",nPage, x0Unit, y0Unit, nxUnit, nyUnit, bSpCol); + DEBUG_COMMAND("VP %d,%d,%d,%d,%d,%d:",nPage, x0Unit, y0Unit, nxUnit, nyUnit, bSpCol); if (nPage >= nPageNum) { - WARNING("VP nPage too large %d\n", nPage); + WARNING("VP nPage too large %d", nPage); return; } @@ -209,24 +209,24 @@ void commandVS() { /* from Rance4 */ int y = getCaliValue(); int wData = getCaliValue(); - DEBUG_COMMAND("VS %d,%d,%d,%d,%d:\n",nPage, nType, x, y, wData); + DEBUG_COMMAND("VS %d,%d,%d,%d,%d:",nPage, nType, x, y, wData); if (nPage >= nPageNum) { - WARNING("VS nPage too large %d\n", nPage); + WARNING("VS nPage too large %d", nPage); return; } if (x >= cxMap || x < 0) { - WARNING("VS x out of range %d\n", x); + WARNING("VS x out of range %d", x); return; } if (y >= cyMap || y < 0) { - WARNING("VS y out of range %d\n", y); + WARNING("VS y out of range %d", y); return; } if (wData < 0) { - WARNING("VS wData illegal value %d\n", wData); + WARNING("VS wData illegal value %d", wData); return; } @@ -249,7 +249,7 @@ void commandVS() { /* from Rance4 */ *UNITMAP_WALKRESULT(nPage, x, y) = wData; break; default: - WARNING("VS unknown type %d\n", nType); + WARNING("VS unknown type %d", nType); } } @@ -259,21 +259,21 @@ void commandVG() { /* from Rance4 */ int x = getCaliValue(); int y = getCaliValue(); - DEBUG_COMMAND("VG %d,%d,%d,%d:\n",nPage, nType, x, y); + DEBUG_COMMAND("VG %d,%d,%d,%d:",nPage, nType, x, y); if (nPage >= nPageNum) { - WARNING("VG nPage too large %d\n", nPage); + WARNING("VG nPage too large %d", nPage); return; } if (x >= cxMap || x < 0) { - NOTICE("VG x out of range %d\n", x); + NOTICE("VG x out of range %d", x); sysVar[0] = UNITMAP_VARIABLE_OUTOFRANGE; return; } if (y >= cyMap || y < 0) { - NOTICE("VG y out of range %d\n", y); + NOTICE("VG y out of range %d", y); sysVar[0] = UNITMAP_VARIABLE_OUTOFRANGE; return; } @@ -289,7 +289,7 @@ void commandVG() { /* from Rance4 */ case 4: sysVar[0] = *UNITMAP_WALKRESULT(nPage, x, y); break; default: - WARNING("VG unknown type %d\n", nType); + WARNING("VG unknown type %d", nType); } } @@ -303,19 +303,19 @@ void commandVH() { /* from Rance4 */ int xx, yy, i, n; int maxfoot, lmtx, lmty, lmtw, lmth; - DEBUG_COMMAND("VH %d,%d,%d,%d,%d,%d:\n",nPage, x, y, width, height, _max); + DEBUG_COMMAND("VH %d,%d,%d,%d,%d,%d:",nPage, x, y, width, height, _max); if (nPage >= nPageNum) { - WARNING("VH nPage too large %d\n", nPage); + WARNING("VH nPage too large %d", nPage); return; } if (x >= cxMap || x < 0) { - WARNING("VH x out of range %d\n", x); + WARNING("VH x out of range %d", x); return; } if (y >= cyMap || y < 0) { - WARNING("VH y out of range %d\n", y); + WARNING("VH y out of range %d", y); return; } @@ -445,14 +445,14 @@ void commandVF() { /* from Panyo */ } ags_updateArea(x0Map, y0Map, cxMap * cxUnit, cyMap * cyUnit); - DEBUG_COMMAND("VF:\n"); + DEBUG_COMMAND("VF:"); } void commandVV() { /* from T2 */ int nPage = getCaliValue(); int fEnable = getCaliValue(); - DEBUG_COMMAND("VV %d,%d:\n",nPage, fEnable); + DEBUG_COMMAND("VV %d,%d:",nPage, fEnable); srcimg[nPage].fEnable = (fEnable == 1 ? TRUE : FALSE); } @@ -463,10 +463,10 @@ void commandVR() { /* from Rance4 */ int *var = getCaliVariable(); int *dst; - DEBUG_COMMAND("VR %d,%d,%p:\n",nPage, nType, var); + DEBUG_COMMAND("VR %d,%d,%p:",nPage, nType, var); if (nPage >= nPageNum) { - WARNING("VR nPage too large %d\n", nPage); + WARNING("VR nPage too large %d", nPage); return; } @@ -480,7 +480,7 @@ void commandVR() { /* from Rance4 */ case 4: dst = UNITMAP_WALKRESULT_PAGETOP(nPage); break; default: - WARNING("VR unknown type %d\n", nType); + WARNING("VR unknown type %d", nType); return; } @@ -493,10 +493,10 @@ void commandVW() { /* from Rance4 */ int *var = getCaliVariable(); int *src; - DEBUG_COMMAND("VW %d,%d,%p:\n",nPage, nType, var); + DEBUG_COMMAND("VW %d,%d,%p:",nPage, nType, var); if (nPage >= nPageNum) { - WARNING("VW nPage too large %d\n", nPage); + WARNING("VW nPage too large %d", nPage); return; } @@ -510,7 +510,7 @@ void commandVW() { /* from Rance4 */ case 4: src = UNITMAP_WALKRESULT_PAGETOP(nPage); break; default: - WARNING("VW unknown type %d\n", nType); + WARNING("VW unknown type %d", nType); return; } @@ -528,9 +528,9 @@ void commandVE() { /* from T2 */ int unit, unit_x, unit_y; UnitMapSrcImg *img; - DEBUG_COMMAND("VE %d,%d,%d,%d,%d,%d:\n", x, y, width, height, out_ptn, flag); + DEBUG_COMMAND("VE %d,%d,%d,%d,%d,%d:", x, y, width, height, out_ptn, flag); if (flag == 1) { - WARNING("VE flag1 is not yet\n"); + WARNING("VE flag1 is not yet"); } for (i = 0; i < nPageNum; i++) { @@ -567,7 +567,7 @@ void commandVZ() { /* from T2 */ int p2 = getCaliValue(); int p3 = getCaliValue(); - DEBUG_COMMAND("VZ %d,%d,%d:\n", p1, p2, p3); + DEBUG_COMMAND("VZ %d,%d,%d:", p1, p2, p3); switch(p1) { case 0: @@ -583,7 +583,7 @@ void commandVZ() { /* from T2 */ cxUnit = p2; cyUnit = p3; break; default: - WARNING("unknown VZ %d:\n", p1); + WARNING("unknown VZ %d:", p1); } } @@ -593,7 +593,7 @@ void commandVX() { /* from T2 */ int p3 = getCaliValue(); int p4 = getCaliValue(); - DEBUG_COMMAND("VX %d,%d,%d,%d:\n", p1, p2, p3, p4); + DEBUG_COMMAND("VX %d,%d,%d,%d:", p1, p2, p3, p4); switch(p1) { case 0: @@ -609,7 +609,7 @@ void commandVX() { /* from T2 */ // commandVF(); break; default: - WARNING("VX unknown command %d:\n", p1); + WARNING("VX unknown command %d:", p1); } } @@ -638,7 +638,7 @@ void commandVT() { /* from Panyo */ case 4: u = *UNITMAP_WALKRESULT(sp, sx + x, sy + y); break; default: - WARNING("VT unknown type %d\n", sa); u = 0; + WARNING("VT unknown type %d", sa); u = 0; } switch(da) { case 1: @@ -653,7 +653,7 @@ void commandVT() { /* from Panyo */ } } - DEBUG_COMMAND("VT %d,%d,%d,%d,%d,%d,%d,%d,%d,%d:\n", sp, sa, sx, sy, width, height, dp, da, dx, dy); + DEBUG_COMMAND("VT %d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", sp, sa, sx, sy, width, height, dp, da, dx, dy); } void commandVB() { @@ -665,7 +665,7 @@ void commandVB() { int y_size = getCaliValue(); int data = getCaliValue(); - DEBUG_COMMAND_YET("VB %d,%d,%d,%d,%d,%d,%d:\n", page, type, x_pos, y_pos, x_size, y_size, data); + DEBUG_COMMAND_YET("VB %d,%d,%d,%d,%d,%d,%d:", page, type, x_pos, y_pos, x_size, y_size, data); } void commandVIC() { /* from Panyo */ @@ -677,7 +677,7 @@ void commandVIC() { /* from Panyo */ int x, y, i; UnitMapSrcImg *img; - DEBUG_COMMAND("VIC %d,%d,%d,%d:\n", sx, sy, width, height); + DEBUG_COMMAND("VIC %d,%d,%d,%d:", sx, sy, width, height); for (i = 0; i < nPageNum; i++) { img = &srcimg[i]; @@ -706,7 +706,7 @@ void commandVIP() { int width = getCaliValue(); int height = getCaliValue(); - DEBUG_COMMAND_YET("VIP %d,%d,%d,%d:\n", x, y, width, height); + DEBUG_COMMAND_YET("VIP %d,%d,%d,%d:", x, y, width, height); } void commandVJ() { @@ -716,7 +716,7 @@ void commandVJ() { int y = getCaliValue(); int max = getCaliValue(); - DEBUG_COMMAND_YET("VJ %d,%d,%d,%d:\n", page, x, y, max); + DEBUG_COMMAND_YET("VJ %d,%d,%d,%d:", page, x, y, max); } static void throttle() { @@ -737,15 +737,15 @@ void commandVA() { /* from Panyo */ if (no >= 10) { var1 = getCaliVariable(); var2 = getCaliVariable(); - DEBUG_COMMAND("VA %d,%d,%p,%p:\n", no, p1, var1, var2); + DEBUG_COMMAND("VA %d,%d,%p,%p:", no, p1, var1, var2); } else { p2 = getCaliValue(); p3 = getCaliValue(); - DEBUG_COMMAND("VA %d,%d,%d,%d:\n", no, p1, p2, p3); + DEBUG_COMMAND("VA %d,%d,%d,%d:", no, p1, p2, p3); } if (p1 > VACMD_MAX) { - WARNING("VA p1 is too lagrge %d\n", p1); + WARNING("VA p1 is too lagrge %d", p1); return; } @@ -861,7 +861,7 @@ void commandVA() { /* from Panyo */ throttle(); break; default: - WARNING("Unknown VA command %d\n", no); + WARNING("Unknown VA command %d", no); } } diff --git a/src/cmdw.c b/src/cmdw.c index 4a6f2c0..d07eda1 100644 --- a/src/cmdw.c +++ b/src/cmdw.c @@ -35,7 +35,7 @@ void commandWW() { ags_setWorldSize(x_size, y_size, color); - DEBUG_COMMAND("WW %d,%d,%d:\n",x_size, y_size, color); + DEBUG_COMMAND("WW %d,%d,%d:",x_size, y_size, color); } void commandWV() { @@ -48,7 +48,7 @@ void commandWV() { ags_setViewArea(start_x, start_y, size_x, size_y); ags_updateFull(); - DEBUG_COMMAND("WV %d,%d,%d,%d:\n",start_x,start_y,size_x, size_y); + DEBUG_COMMAND("WV %d,%d,%d,%d:",start_x,start_y,size_x, size_y); } void commandWZ() { @@ -70,7 +70,7 @@ void commandWZ() { default: break; } - DEBUG_COMMAND("WZ %d,%d:\n", p1, sw); + DEBUG_COMMAND("WZ %d,%d:", p1, sw); } void commandWX() { @@ -83,5 +83,5 @@ void commandWX() { ags_setExposeSwitch(TRUE); ags_updateArea(x0, y0, cx, cy); - DEBUG_COMMAND("WX %d,%d,%d,%d:\n", x0, y0, cx, cy); + DEBUG_COMMAND("WX %d,%d,%d,%d:", x0, y0, cx, cy); } diff --git a/src/cmdy.c b/src/cmdy.c index 46455f3..fb01124 100644 --- a/src/cmdy.c +++ b/src/cmdy.c @@ -125,7 +125,7 @@ void commandY() { sysVar[0] = (int)(genrand() * p2) +1; } } else { - WARNING("Y undefined command %d\n", p1); + WARNING("Y undefined command %d", p1); } - DEBUG_COMMAND("Y %d,%d:\n",p1,p2); + DEBUG_COMMAND("Y %d,%d:",p1,p2); } diff --git a/src/cmdz.c b/src/cmdz.c index b68abae..1497df0 100644 --- a/src/cmdz.c +++ b/src/cmdz.c @@ -85,7 +85,7 @@ void commandZC() { WARNING("commandZC(): Unknown Command (%d)", m); break; } - DEBUG_COMMAND("ZC %d,%d:\n",m,n); + DEBUG_COMMAND("ZC %d,%d:",m,n); } void commandZM() { @@ -93,13 +93,13 @@ void commandZM() { int size = getCaliValue(); if (size > 100) { - WARNING("msg font size force to 100 from %d\n", size); + WARNING("msg font size force to 100 from %d", size); size = 100; } nact->msg.MsgFontSize = size; - DEBUG_COMMAND("ZM %d:\n",size); + DEBUG_COMMAND("ZM %d:",size); } void commandZS() { @@ -108,7 +108,7 @@ void commandZS() { nact->sel.MsgFontSize = size; - DEBUG_COMMAND("ZS %d:\n",size); + DEBUG_COMMAND("ZS %d:",size); } void commandZB() { @@ -117,7 +117,7 @@ void commandZB() { nact->msg.MsgFontBoldSize = size; - DEBUG_COMMAND("ZB %d:\n",size); + DEBUG_COMMAND("ZB %d:",size); } void commandZH() { @@ -126,7 +126,7 @@ void commandZH() { sys_setHankakuMode(sw); - DEBUG_COMMAND("ZH %d:\n",sw); + DEBUG_COMMAND("ZH %d:",sw); } void commandZW() { @@ -141,7 +141,7 @@ void commandZW() { nact->messagewait_cancel = (sw & 0x200) ? TRUE : FALSE; } - DEBUG_COMMAND("ZW %d:\n", sw); + DEBUG_COMMAND("ZW %d:", sw); } void commandZL() { @@ -150,7 +150,7 @@ void commandZL() { nact->msg.LineIncrement = line; - DEBUG_COMMAND("ZL %d:\n",line); + DEBUG_COMMAND("ZL %d:",line); } void commandZE() { @@ -159,7 +159,7 @@ void commandZE() { nact->sel.ClearMsgWindow = sw == 0 ? FALSE : TRUE; - DEBUG_COMMAND("ZE %d:\n", sw); + DEBUG_COMMAND("ZE %d:", sw); } void commandZF() { @@ -177,7 +177,7 @@ void commandZF() { nact->sel.WinResizeWidth = TRUE; break; } - DEBUG_COMMAND("ZF %d:\n", sw); + DEBUG_COMMAND("ZF %d:", sw); } void commandZD() { @@ -200,7 +200,7 @@ void commandZD() { var = getCaliVariable(); *var = 0; break; } - DEBUG_COMMAND("ZD %d,%d:\n", c0, sw); + DEBUG_COMMAND("ZD %d,%d:", c0, sw); } void commandZT0() { @@ -231,7 +231,7 @@ void commandZT0() { *(var + 5) = lc->tm_sec; *(var + 6) = 1 + lc->tm_wday; - DEBUG_COMMAND("ZT0 %p:\n", var); + DEBUG_COMMAND("ZT0 %p:", var); } void commandZT1() { @@ -240,7 +240,7 @@ void commandZT1() { reset_counter(0, 1, n); - DEBUG_COMMAND("ZT1 %d:\n", n); + DEBUG_COMMAND("ZT1 %d:", n); } void commandZT2() { @@ -250,7 +250,7 @@ void commandZT2() { *var = val & 0xffff; - DEBUG_COMMAND("ZT2 %p:\n", var); + DEBUG_COMMAND("ZT2 %p:", var); } void commandZT3() { @@ -260,7 +260,7 @@ void commandZT3() { *var = val & 0xffff; - DEBUG_COMMAND("ZT3 %p:\n", var); + DEBUG_COMMAND("ZT3 %p:", var); } void commandZT4() { @@ -270,7 +270,7 @@ void commandZT4() { *var = val & 0xffff; - DEBUG_COMMAND("ZT4 %p:\n", var); + DEBUG_COMMAND("ZT4 %p:", var); } void commandZT5() { @@ -280,7 +280,7 @@ void commandZT5() { *var = val & 0xffff; - DEBUG_COMMAND("ZT5 %d:\n", val); + DEBUG_COMMAND("ZT5 %d:", val); } void commandZT10() { @@ -290,7 +290,7 @@ void commandZT10() { int count = getCaliValue(); if (num > 256) { - WARNING("invalid timer id %d\n", num); + WARNING("invalid timer id %d", num); } else if (num == 0) { for (int i = 1; i <= 256; i++) reset_counter(i, base, count); @@ -298,7 +298,7 @@ void commandZT10() { reset_counter(num, base, count); } - DEBUG_COMMAND("ZT10 %d,%d,%d:\n", num, base, count); + DEBUG_COMMAND("ZT10 %d,%d,%d:", num, base, count); } void commandZT11() { @@ -308,11 +308,11 @@ void commandZT11() { int divisor = counters[num].divisor ? counters[num].divisor : 1; if (num > 256) - WARNING("invalid timer id %d\n", num); + WARNING("invalid timer id %d", num); else *var = (get_counter(num) / divisor) & 0xffff; - DEBUG_COMMAND("ZT11 %d,%d:\n", num, *var); + DEBUG_COMMAND("ZT11 %d,%d:", num, *var); } void commandZT20() { @@ -320,7 +320,7 @@ void commandZT20() { int p1 = getCaliValue(); sysVar[0] = sys_keywait(p1, KEYWAIT_NONCANCELABLE); - DEBUG_COMMAND("ZT20 %d:\n",p1); + DEBUG_COMMAND("ZT20 %d:",p1); } void commandZT21() { @@ -329,14 +329,14 @@ void commandZT21() { sysVar[0] = sys_keywait(p1, KEYWAIT_CANCELABLE); - DEBUG_COMMAND("ZT21 %d:\n",p1); + DEBUG_COMMAND("ZT21 %d:",p1); } void commandZZ0() { /* ＳＹＳＴＥＭ３．５を終了する */ int sw = getCaliValue(); - DEBUG_COMMAND("ZZ0 %d:\n",sw); + DEBUG_COMMAND("ZZ0 %d:",sw); if (sw == 0) { #ifdef __EMSCRIPTEN__ @@ -389,7 +389,7 @@ void commandZZ2() { #endif svar_set(num, str); - DEBUG_COMMAND("ZZ2 %d:\n",num); + DEBUG_COMMAND("ZZ2 %d:",num); } void commandZZ3() { @@ -402,7 +402,7 @@ void commandZZ3() { *(var + 1) = info.height; *(var + 2) = info.depth; - DEBUG_COMMAND("ZZ3 %p:\n",var); + DEBUG_COMMAND("ZZ3 %p:",var); } void commandZZ4() { @@ -415,7 +415,7 @@ void commandZZ4() { *(var + 1) = info.height; *(var + 2) = info.depth; - DEBUG_COMMAND("ZZ4 %p:\n",var); + DEBUG_COMMAND("ZZ4 %p:",var); } void commandZZ5() { @@ -428,7 +428,7 @@ void commandZZ5() { *(var + 1) = info.height; *(var + 2) = info.depth; - DEBUG_COMMAND("ZZ5 %p:\n",var); + DEBUG_COMMAND("ZZ5 %p:",var); } void commandZZ7() { @@ -437,14 +437,14 @@ void commandZZ7() { *var = 65535; - DEBUG_COMMAND("ZZ7 %p:\n",var); + DEBUG_COMMAND("ZZ7 %p:",var); } void commandZZ8() { // メモリオンバッファの残り容量を得る int *var = getCaliVariable(); - DEBUG_COMMAND_YET("ZZ8 %p:\n",var); + DEBUG_COMMAND_YET("ZZ8 %p:",var); } void commandZZ9() { @@ -457,7 +457,7 @@ void commandZZ9() { *(var + 1) = info.height; *(var + 2) = info.depth; - DEBUG_COMMAND("ZZ9 %p:\n",var); + DEBUG_COMMAND("ZZ9 %p:",var); } void commandZZ10() { @@ -466,7 +466,7 @@ void commandZZ10() { *var = sdl_isFullscreen() ? 1 : 0; - DEBUG_COMMAND("ZZ10 %d:\n",*var); + DEBUG_COMMAND("ZZ10 %d:",*var); } void commandZZ13() { @@ -480,7 +480,7 @@ void commandZZ13() { #endif nact->msg.MsgFont = num; - DEBUG_COMMAND("ZZ13 %d:\n",num); + DEBUG_COMMAND("ZZ13 %d:",num); } void commandZZ14() { @@ -496,7 +496,7 @@ void commandZZ14() { if (no <= 0) return; svar_set(no, s); - DEBUG_COMMAND("ZZ14 %d:\n", no); + DEBUG_COMMAND("ZZ14 %d:", no); } void commandZG() { @@ -505,7 +505,7 @@ void commandZG() { cg_loadCountVar = var; - DEBUG_COMMAND("ZG %p:\n",var); + DEBUG_COMMAND("ZG %p:",var); } void commandZI() { /* T2 */ @@ -515,7 +515,7 @@ void commandZI() { /* T2 */ set_hak_keymode(key, mode); - DEBUG_COMMAND("ZI %d,%d:\n", key, mode); + DEBUG_COMMAND("ZI %d,%d:", key, mode); } void commandZA() { /* T2 */ @@ -532,10 +532,10 @@ void commandZA() { /* T2 */ case 3: nact->msg.AutoPageChange = (p2 == 0 ? FALSE : TRUE); break; default: - WARNING("Unknown ZA comannd %d, %d\n", p1, p2); + WARNING("Unknown ZA comannd %d, %d", p1, p2); } - DEBUG_COMMAND("ZA %d,%d:\n", p1, p2); + DEBUG_COMMAND("ZA %d,%d:", p1, p2); } void commandZK() { @@ -544,7 +544,7 @@ void commandZK() { int p2 = getCaliValue(); const char *str = sl_getString(':'); - DEBUG_COMMAND("ZK %d,%d,%s:\n", p1, p2, str); + DEBUG_COMMAND("ZK %d,%d,%s:", p1, p2, str); } void commandZR() { @@ -558,7 +558,7 @@ void commandZR() { *var = (int)(genrand() * num) +1; } - DEBUG_COMMAND("ZR %d,%d:\n", num, *var); + DEBUG_COMMAND("ZR %d,%d:", num, *var); } void commandZU() { @@ -568,7 +568,7 @@ void commandZU() { if (sw <= CHARACTER_ENCODING_MAX) sys_setCharacterEncoding(sw); - DEBUG_COMMAND("ZU %d:\n",sw); + DEBUG_COMMAND("ZU %d:",sw); } void cmdz_reset(void) { diff --git a/src/cursor.c b/src/cursor.c index d2e04d4..561ef49 100644 --- a/src/cursor.c +++ b/src/cursor.c @@ -90,12 +90,12 @@ static boolean check_iconheader(BYTE *data) { /* Number of images (>0) */ if (cursorHeader.idCount == 0) { - WARNING("Cursor: no images in file!\n"); + WARNING("Cursor: no images in file!"); return FALSE; } if (cursorHeader.idCount > 1) { - WARNING("Cursor: warning: too much images in file!\n"); + WARNING("Cursor: warning: too much images in file!"); } return TRUE; } @@ -112,7 +112,7 @@ static int read_direntries(BYTE* data) { data++; /* and validate data */ - NOTICE("Cursor: bWidth==%d bHeight==%d\n", + NOTICE("Cursor: bWidth==%d bHeight==%d", (int)cursordirentry.bWidth, (int)cursordirentry.bHeight); @@ -142,15 +142,15 @@ static int read_direntries(BYTE* data) { return 0; } - NOTICE("Cursor: x==%d y==%d\n", + NOTICE("Cursor: x==%d y==%d", (int)cursordirentry.wxHotspot, (int)cursordirentry.wyHotspot); - NOTICE("Width: %d\n", (int)(cursordirentry.bWidth)); - NOTICE("Height: %d\n", (int)(cursordirentry.bHeight)); - NOTICE("Bit Count (unused): %d\n", (int)(cursordirentry.dwBytesInRes)); - NOTICE("Total bytes: %ld\n", (long)(cursordirentry.dwBytesInRes)); + NOTICE("Width: %d", (int)(cursordirentry.bWidth)); + NOTICE("Height: %d", (int)(cursordirentry.bHeight)); + NOTICE("Bit Count (unused): %d", (int)(cursordirentry.dwBytesInRes)); + NOTICE("Total bytes: %ld", (long)(cursordirentry.dwBytesInRes)); return (int)(data - p); } @@ -173,7 +173,7 @@ static int read_bitmapinfo(BYTE* data) { ih.biHeight=LittleEndian_getDW(data,0); data += 4; - NOTICE("Cursor: biWidth==%d biHeight==%d\n", (int)ih.biWidth, (int)ih.biHeight); + NOTICE("Cursor: biWidth==%d biHeight==%d", (int)ih.biWidth, (int)ih.biHeight); if (ih.biWidth == 0 || ih.biHeight == 0) { return 0; @@ -186,7 +186,7 @@ static int read_bitmapinfo(BYTE* data) { /* number of color bits (2,4,8) */ ih.biBitCount = LittleEndian_getW(data, 0); if (ih.biBitCount != 1) { - WARNING("Cursor: %d not supported color bit\n", ih.biBitCount); + WARNING("Cursor: %d not supported color bit", ih.biBitCount); return 0; } data += 2; @@ -196,7 +196,7 @@ static int read_bitmapinfo(BYTE* data) { data += 4; if (ih.biCompression != 0) { - WARNING("Cursor: invalid compression value of %d\n", (int)ih.biCompression); + WARNING("Cursor: invalid compression value of %d", (int)ih.biCompression); return 0; } @@ -204,7 +204,7 @@ static int read_bitmapinfo(BYTE* data) { ih.biSizeImage = LittleEndian_getDW(data, 0); data += 4; - NOTICE("Cursor: biSizeImage==%d\n", (int)ih.biSizeImage); + NOTICE("Cursor: biSizeImage==%d", (int)ih.biSizeImage); ih.biXPelsPerMeter = LittleEndian_getDW(data, 0); data += 4; @@ -249,7 +249,7 @@ static int read_rgbquad(BYTE* data) { data++; cc[j].rgbReserved = *data; data++; - NOTICE("#%d: Red: %d Green: %d Blue: %d\n", j, + NOTICE("#%d: Red: %d Green: %d Blue: %d", j, cc[j].rgbRed, cc[j].rgbGreen, cc[j].rgbBlue); @@ -264,20 +264,20 @@ static boolean cursor_load_mono(BYTE *d, int no) { /* check header information */ if (check_iconheader(d) == FALSE) { - WARNING("check_iconhdader fail\n"); + WARNING("check_iconhdader fail"); return FALSE; } /* read dentries */ if ((pos += read_direntries(d + pos)) <= 6) { - WARNING("read dentries fail\n"); + WARNING("read dentries fail"); return FALSE; } /* read bitmap info */ p1 = read_bitmapinfo(d + pos); if (p1 == 0) { - WARNING("unable to read bitmap info\n"); + WARNING("unable to read bitmap info"); return FALSE; } @@ -286,7 +286,7 @@ static boolean cursor_load_mono(BYTE *d, int no) { /* read rgb quad */ p1 = read_rgbquad(d + pos); if (p1 == 0) { - WARNING("unable to read palette table\n"); + WARNING("unable to read palette table"); return FALSE; } @@ -294,7 +294,7 @@ static boolean cursor_load_mono(BYTE *d, int no) { /* read pixedl data */ if (sdl_cursorNew(d + pos, no, &cursorImage, &cursordirentry) == FALSE) { - WARNING("unable to read pixel data\n"); + WARNING("unable to read pixel data"); return FALSE; } return TRUE; @@ -316,11 +316,11 @@ static boolean cursor_load_anim(BYTE *data, int no) { while (b < (data + riffsize)) { if (search_chunk(b, "LIST", "INFO", &c)) { - NOTICE("LIST(INFO) ignore size = %d\n", c.size); + NOTICE("LIST(INFO) ignore size = %d", c.size); b += c.size + 8; } else if (search_chunk(b, "anih", NULL, &c)) { BYTE *src = c.data; - NOTICE("anih size = %d\n", c.size); + NOTICE("anih size = %d", c.size); anicurHeader.cbSizeof = LittleEndian_getW(src, 0); anicurHeader.cFrames = LittleEndian_getW(src, 4); anicurHeader.cSteps = LittleEndian_getW(src, 8); @@ -336,7 +336,7 @@ static boolean cursor_load_anim(BYTE *data, int no) { b += c.size + 8; } else if (search_chunk(b, "rate", NULL, &c)) { BYTE *src = c.data; - NOTICE("rate size = %d\n", c.size); + NOTICE("rate size = %d", c.size); if (anicurHeader.fl & 0x01) { int i; anicurHeader.rate = malloc(sizeof(int) * anicurHeader.cSteps); @@ -347,11 +347,11 @@ static boolean cursor_load_anim(BYTE *data, int no) { } b += c.size + 8; } else if (search_chunk(b, "icon", NULL, &c)) { - NOTICE("icon size = %d\n", c.size); + NOTICE("icon size = %d", c.size); cursor_load_mono(c.data, no); /* last pattern is uesd */ b += c.size + 8; } else if (search_chunk(b, "LIST", "frame", &c)) { - NOTICE("LIST(frame) size = %d\n", c.size); + NOTICE("LIST(frame) size = %d", c.size); b += 12; } else { WARNING("UnKnown chunk"); @@ -366,12 +366,12 @@ void cursor_load(int no, int linkno) { /* no must be from 100 to 255 */ if (no < 100 || no > 256){ - WARNING("wrong cursor number(%d)\n", no); + WARNING("wrong cursor number(%d)", no); } /* load data */ if (NULL == (dfile = ald_getdata(DRIFILE_RSC, linkno -1))) { - WARNING("ald_getdata fail\n"); + WARNING("ald_getdata fail"); return; } diff --git a/src/debug_symbol.c b/src/debug_symbol.c index 324f67a..47dc271 100644 --- a/src/debug_symbol.c +++ b/src/debug_symbol.c @@ -61,7 +61,7 @@ struct debug_symbols { const char *fget4cc(FILE *fp) { static char buf[5]; if (fread(buf, 4, 1, fp) != 1) { - WARNING("fread: %s\n", strerror(errno)); + WARNING("fread: %s", strerror(errno)); buf[0] = '\0'; } return buf; @@ -70,7 +70,7 @@ const char *fget4cc(FILE *fp) { int fgetdw(FILE *fp) { BYTE buf[4]; if (fread(buf, 4, 1, fp) != 1) { - WARNING("fread: %s\n", strerror(errno)); + WARNING("fread: %s", strerror(errno)); return 0; } return LittleEndian_getDW(buf, 0); @@ -188,17 +188,17 @@ static boolean load_func(struct debug_symbols *dsym, char *buf) { struct debug_symbols *dsym_load(const char *path) { FILE *fp = fopen(path, "rb"); if (!fp) { - WARNING("Cannot open %s: %s\n", path, strerror(errno)); + WARNING("Cannot open %s: %s", path, strerror(errno)); return NULL; } if (strcmp("DSYM", fget4cc(fp))) { - WARNING("%s: wrong signature\n", path); + WARNING("%s: wrong signature", path); fclose(fp); return NULL; } int version = fgetdw(fp); if (version != 0) { - WARNING("%s: unsupported debug info version\n", path); + WARNING("%s: unsupported debug info version", path); fclose(fp); return NULL; } @@ -211,12 +211,12 @@ struct debug_symbols *dsym_load(const char *path) { int section_size = fgetdw(fp); void *section_content = malloc(section_size); if (!section_content) { - WARNING("Memory allocation failure while loading %s\n", path); + WARNING("Memory allocation failure while loading %s", path); fclose(fp); return NULL; } if (fread(section_content, section_size - 8, 1, fp) != 1) { - WARNING("%s: I/O error\n", path, strerror(errno)); + WARNING("%s: I/O error", path, strerror(errno)); fclose(fp); return NULL; } @@ -233,7 +233,7 @@ struct debug_symbols *dsym_load(const char *path) { } else if (!strcmp(tag, "FUNC")) { ok = load_func(dsym, section_content); } else { - WARNING("%s: unrecognized section %s\n", path, tag); + WARNING("%s: unrecognized section %s", path, tag); } if (!ok) { fclose(fp); @@ -241,7 +241,7 @@ struct debug_symbols *dsym_load(const char *path) { } } if (fgetc(fp) != EOF) - WARNING("%s: broken debug information structure\n", path); + WARNING("%s: broken debug information structure", path); fclose(fp); return dsym; } diff --git a/src/ecopy.c b/src/ecopy.c index 9b859b1..cbee085 100644 --- a/src/ecopy.c +++ b/src/ecopy.c @@ -406,7 +406,7 @@ void ags_eCopyArea(int sx, int sy, int w, int h, int dx, int dy, int sw, int opt int ret = 0; #if 0 - NOTICE("ec_area sx %d sy %d w %d h %d dx %d dy %d sw %d opt %d spc %d cancel %s\n", + NOTICE("ec_area sx %d sy %d w %d h %d dx %d dy %d sw %d opt %d spc %d cancel %s", sx, sy, w, h, dx, dy, sw, opt, spCol, cancel ? "True" : "False"); #endif if (!ags_check_param(&sx, &sy, &w, &h)) return; @@ -535,7 +535,7 @@ void ags_eCopyArea(int sx, int sy, int w, int h, int dx, int dy, int sw, int opt break; default: eCopyUpdateArea(dx, dy, w, h, dx, dy); - WARNING("effect %d is not presented.\n", sw); + WARNING("effect %d is not presented.", sw); break; } nact->waitcancel_key = ret; diff --git a/src/font.c b/src/font.c index 6241f45..2acd87c 100644 --- a/src/font.c +++ b/src/font.c @@ -56,7 +56,7 @@ static void font_insert(int size, int type, TTF_Font *font) { fonttbl[fontcnt].id = font; if (fontcnt >= (FONTTABLEMAX -1)) { - WARNING("Font table is full.\n"); + WARNING("Font table is full."); } else { fontcnt++; } @@ -112,7 +112,7 @@ SDL_Surface *font_get_glyph(const char *str_utf8) { fs = TTF_RenderUTF8_Solid(fontset->id, str_utf8, color); } if (!fs) - WARNING("Text rendering failed: %s\n", TTF_GetError()); + WARNING("Text rendering failed: %s", TTF_GetError()); return fs; } @@ -174,7 +174,7 @@ SDL_Rect font_draw_glyph(int x, int y, const char *str_utf8, BYTE cl) { fs = TTF_RenderUTF8_Solid(fontset->id, str_utf8, sdl_col[cl]); } if (!fs) { - WARNING("Text rendering failed: %s\n", TTF_GetError()); + WARNING("Text rendering failed: %s", TTF_GetError()); return r_dst; } diff --git a/src/jpeg.c b/src/jpeg.c index 41e2eba..a647a6a 100644 --- a/src/jpeg.c +++ b/src/jpeg.c @@ -41,7 +41,7 @@ cgdata *jpeg_extract(BYTE *data, size_t size) { int width, height, channels; BYTE *pixels = stbi_load_from_memory(data, size, &width, &height, &channels, 3); if (!pixels) { - WARNING("cannot decode jpeg: %s\n", stbi_failure_reason()); + WARNING("cannot decode jpeg: %s", stbi_failure_reason()); return NULL; } diff --git a/src/midi.portmidi.c b/src/midi.portmidi.c index 5b0607c..bc6f6ab 100644 --- a/src/midi.portmidi.c +++ b/src/midi.portmidi.c @@ -84,22 +84,22 @@ static boolean should_unpause = FALSE; static boolean should_loop = FALSE; static int midi_initialize(char *devnm, int subdev) { - NOTICE("midi_initialize: devnm = [%s] subdev = [%i]\n", devnm, subdev); + NOTICE("midi_initialize: devnm = [%s] subdev = [%i]", devnm, subdev); PmError err; if ((err = Pm_Initialize()) != pmNoError) { - WARNING("%s\n", Pm_GetErrorText(err)); + WARNING("%s", Pm_GetErrorText(err)); return NG; } int ndevices = Pm_CountDevices(); if (ndevices == 0 || subdev >= ndevices) { - WARNING("invalid midi device number\n"); + WARNING("invalid midi device number"); return NG; } if ((err = Pm_OpenOutput(&stream, subdev, NULL, 0, NULL, NULL, 10)) != pmNoError) { - WARNING("%s\n", Pm_GetErrorText(err)); + WARNING("%s", Pm_GetErrorText(err)); return NG; } @@ -107,11 +107,11 @@ static int midi_initialize(char *devnm, int subdev) { } static int midi_exit(void) { - NOTICE("midi_exit\n"); + NOTICE("midi_exit"); if (thread_running) { midi_stop(); } - NOTICE("midi stopped\n"); + NOTICE("midi stopped"); Pm_Close(stream); stream = NULL; @@ -127,7 +127,7 @@ static int midi_reset(void) { } static int midi_start(int no, int loop, char *data, int datalen) { - NOTICE("midi_start: no = %i loop = %i datalen = %i\n", no, loop, datalen); + NOTICE("midi_start: no = %i loop = %i datalen = %i", no, loop, datalen); should_stop = FALSE; should_pause = FALSE; should_unpause = FALSE; @@ -135,20 +135,20 @@ static int midi_start(int no, int loop, char *data, int datalen) { if (thread_running) { if (midi_stop() == NG) { - WARNING("error stopping midi thread\n"); + WARNING("error stopping midi thread"); return NG; } } midi = mf_read_midifile(data, datalen); if (midi == NULL) { - WARNING("error reading midi file\n"); + WARNING("error reading midi file"); return NG; } thread = SDL_CreateThread(midi_thread, "PortMIDI", NULL); if (!thread) { - WARNING("could not create midi thread\n"); + WARNING("could not create midi thread"); return NG; } @@ -157,7 +157,7 @@ static int midi_start(int no, int loop, char *data, int datalen) { } static int midi_stop() { - NOTICE("midi_stop\n"); + NOTICE("midi_stop"); should_stop = TRUE; SDL_WaitThread(thread, NULL); thread = NULL; @@ -165,19 +165,19 @@ static int midi_stop() { } static int midi_pause() { - NOTICE("midi_pause\n"); + NOTICE("midi_pause"); should_pause = TRUE; return OK; } static int midi_unpause() { - NOTICE("midi_unpause\n"); + NOTICE("midi_unpause"); should_unpause = TRUE; return OK; } static int midi_getpos(midiplaystate *st) { - NOTICE("midi_getpos\n"); + NOTICE("midi_getpos"); if (!thread_running) { st->in_play = FALSE; st->loc_ms = 0; @@ -191,7 +191,7 @@ static int midi_getpos(midiplaystate *st) { } static int midi_getflag(int mode, int idx) { - NOTICE("midi_getflag: %i = %i\n", mode, idx); + NOTICE("midi_getflag: %i = %i", mode, idx); if (mode == 0) { /* flag */ return flags.midi_flag[idx]; @@ -203,7 +203,7 @@ static int midi_getflag(int mode, int idx) { } static int midi_setflag(int mode, int idx, int val) { - NOTICE("midi_setflag: %i %i = %i\n", mode, idx, val); + NOTICE("midi_setflag: %i %i = %i", mode, idx, val); if (mode == 0) { /* flag */ return flags.midi_flag[idx] = val; @@ -225,14 +225,14 @@ static void midi_write(midievent_t event) { } static void midi_allnotesoff() { - NOTICE("midi_allnotesoff\n"); + NOTICE("midi_allnotesoff"); for (int i = 0; i < 16; i++) { Pm_WriteShort(stream, 0, Pm_Message(0xb0 + i, 0x7b, 0x00)); } } static void midi_send_reset() { - NOTICE("midi_send_reset\n"); + NOTICE("midi_send_reset"); for (int i = 0; i < 16; i++) { Pm_WriteShort(stream, 0, Pm_Message(0xb0 + i, 0x78, 0x00)); Pm_WriteShort(stream, 0, Pm_Message(0xb0 + i, 0x79, 0x00)); @@ -243,7 +243,7 @@ static void midi_settempo(midievent_t event) { int *p; p = (int*)event.data; tempo = (unsigned int)*p; - NOTICE("midi_settempo(%i)\n", tempo); + NOTICE("midi_settempo(%i)", tempo); ppqn = tempo / midi->division; pc++; } @@ -281,18 +281,18 @@ static void midi_handlesys35(midievent_t event) { switch (vn1) { case 0: /* set label */ - NOTICE("set label\n"); + NOTICE("set label"); pc += 6; break; case 1: /* jump */ midi_allnotesoff(); pc = midi->sys35_label[vn2]; - NOTICE("jump to tick [%i]\n", pc); + NOTICE("jump to tick [%i]", pc); break; case 2: /* set flag */ - NOTICE("set flag %i = %i\n", vn2, vn3); + NOTICE("set flag %i = %i", vn2, vn3); flags.midi_flag[vn2] = vn3; pc += 6; break; @@ -302,15 +302,15 @@ static void midi_handlesys35(midievent_t event) { pc = midi->sys35_label[vn3]; tick = ctick = event.ctime; midi_allnotesoff(); - NOTICE("jump to tick [%i] ctime = [%i]\n", pc, tick); + NOTICE("jump to tick [%i] ctime = [%i]", pc, tick); } else { - NOTICE("flag [%i] not set, not jumping\n", vn2); + NOTICE("flag [%i] not set, not jumping", vn2); pc += 6; } break; case 4: /* set variable */ - NOTICE("set var %i = %i\n", vn2, vn3); + NOTICE("set var %i = %i", vn2, vn3); flags.midi_variable[vn2] = vn3; pc += 6; break; @@ -320,21 +320,21 @@ static void midi_handlesys35(midievent_t event) { pc = midi->sys35_label[vn3]; tick = ctick = event.ctime; midi_allnotesoff(); - NOTICE("jump to tick [%i] ctime = [%i]\n", pc, tick); + NOTICE("jump to tick [%i] ctime = [%i]", pc, tick); } else { - NOTICE("var [%i] not set, not jumping\n", vn2); + NOTICE("var [%i] not set, not jumping", vn2); pc += 6; } break; default: - NOTICE("unknown [%i]\n", vn2); + NOTICE("unknown [%i]", vn2); break; } } static int midi_thread(void *args) { thread_running = TRUE; - NOTICE("midi_thread started\n"); + NOTICE("midi_thread started"); start: midi_allnotesoff(); @@ -349,24 +349,24 @@ static int midi_thread(void *args) { while (TRUE) { if (pc >= nevents) { - NOTICE("midi_thread finished midi file\n"); + NOTICE("midi_thread finished midi file"); break; } if (should_stop) { - NOTICE("midi_thread received stop command\n"); + NOTICE("midi_thread received stop command"); break; } if (should_pause) { - NOTICE("midi_thread pausing\n"); + NOTICE("midi_thread pausing"); midi_allnotesoff(); should_pause = FALSE; pausing = TRUE; } if (should_unpause) { - NOTICE("midi_thread unpausing\n"); + NOTICE("midi_thread unpausing"); should_unpause = FALSE; pausing = FALSE; } @@ -391,7 +391,7 @@ static int midi_thread(void *args) { midi_handlesys35(event); break; default: - NOTICE("unknown type of event [%x]\n", event.type); + NOTICE("unknown type of event [%x]", event.type); break; } } @@ -402,7 +402,7 @@ static int midi_thread(void *args) { goto start; if (midi != NULL) { - NOTICE("freeing midi file\n"); + NOTICE("freeing midi file"); mf_remove_midifile(midi); midi = NULL; } @@ -414,6 +414,6 @@ static int midi_thread(void *args) { should_stop = FALSE; thread_running = FALSE; - NOTICE("midi_thread done.\n"); + NOTICE("midi_thread done."); return 0; } diff --git a/src/midi.rawmidi.c b/src/midi.rawmidi.c index 32a2e4a..ecabe3f 100644 --- a/src/midi.rawmidi.c +++ b/src/midi.rawmidi.c @@ -199,7 +199,7 @@ static int midi_subdev; void seqbuf_dump(void) { if (_seqbufptr) { if (write(midifd, _seqbuf, _seqbufptr) == -1) - WARNING("write: %s\n", strerror(errno)); + WARNING("write: %s", strerror(errno)); } _seqbufptr = 0; } @@ -318,7 +318,7 @@ static void *midi_mainloop(struct midiinfo *midi) { break; } } else { - WARNING("Unknown type of event %x (NEVER!).\n", midi->event[i].type); + WARNING("Unknown type of event %x (NEVER!).", midi->event[i].type); } } return NULL; @@ -341,14 +341,14 @@ static int midi_initilize(char *devnm, int subdev) { #ifdef ENABLE_MIDI_RAWMIDI myflush = raw_myflush; mywrite = raw_mywrite; - NOTICE("RAWMIDI Initilize OK\n"); + NOTICE("RAWMIDI Initilize OK"); #endif } else { #ifdef ENABLE_MIDI_SEQMIDI myflush = seq_myflush; mywrite = seq_mywrite; midi_subdev = subdev; - NOTICE("SEQMIDI Initilize OK\n"); + NOTICE("SEQMIDI Initilize OK"); #endif } @@ -392,12 +392,12 @@ static int midi_start(int no, int loop, char *data, int datalen) { struct midiinfo *midi = mf_read_midifile(data, datalen); if (!midi) { - WARNING("error reading midi file\n"); + WARNING("error reading midi file"); return NG; } if (0 > (midifd = open(mididevname, O_RDWR))) { - WARNING("error opening %s: %s\n", mididevname, strerror(errno)); + WARNING("error opening %s: %s", mididevname, strerror(errno)); mf_remove_midifile(midi); return NG; } @@ -406,7 +406,7 @@ static int midi_start(int no, int loop, char *data, int datalen) { { int nrsynths; if (-1 == ioctl(mididev, SNDCTL_SEQ_NRSYNTHS, &nrsynths)) { - WARNING("SNDCTL_SEQ_NRSYNTHS: %s\n", strerror(errno)); + WARNING("SNDCTL_SEQ_NRSYNTHS: %s", strerror(errno)); mf_remove_midifile(midi); close(midifd); midifid = -1; diff --git a/src/midifile.c b/src/midifile.c index 6895050..c5ab4f0 100644 --- a/src/midifile.c +++ b/src/midifile.c @@ -77,7 +77,7 @@ static long to32bit(int c1, int c2, int c3, int c4) { static void midi_inc() { midi->ceptr++; if (midi->ceptr > MAXMIDIEVENT) { - NOTICE("too much event\n"); + NOTICE("too much event"); sys_exit(0); } } @@ -261,7 +261,7 @@ static void chanmessage(int status, int c1, int c2) { midi_chanpressure(chan, c1); break; default: - NOTICE("Unknown Message\n"); + NOTICE("Unknown Message"); } } @@ -271,52 +271,52 @@ static void metaevent(int type) { switch(type) { case 0x00: - NOTICE("seqnum\n"); + NOTICE("seqnum"); break; case 0x01: - NOTICE("text event (Text Event, Ignored)\n"); + NOTICE("text event (Text Event, Ignored)"); break; case 0x02: - NOTICE("copyright notice (Text Event, Ignored)\n"); + NOTICE("copyright notice (Text Event, Ignored)"); break; case 0x03: - NOTICE("sequence / track name (Text Event, Ignored)\n"); + NOTICE("sequence / track name (Text Event, Ignored)"); break; case 0x04: - NOTICE("instrument name (Text Event, Ignored)\n"); + NOTICE("instrument name (Text Event, Ignored)"); break; case 0x05: - NOTICE("lyric (Text Event, Ignored)\n"); + NOTICE("lyric (Text Event, Ignored)"); break; case 0x06: - NOTICE("marker (Text Event, Ignored)\n"); + NOTICE("marker (Text Event, Ignored)"); break; case 0x07: - NOTICE("cue point (Text Event, Ignored)\n"); + NOTICE("cue point (Text Event, Ignored)"); break; case 0x08: - NOTICE("meta event 0x08 (Text Event, Ignored)\n"); + NOTICE("meta event 0x08 (Text Event, Ignored)"); break; case 0x09: - NOTICE("meta event 0x09 (Text Event, Ignored)\n"); + NOTICE("meta event 0x09 (Text Event, Ignored)"); break; case 0x0a: - NOTICE("meta event 0x0a (Text Event, Ignored)\n"); + NOTICE("meta event 0x0a (Text Event, Ignored)"); break; case 0x0b: - NOTICE("meta event 0x0b (Text Event, Ignored)\n"); + NOTICE("meta event 0x0b (Text Event, Ignored)"); break; case 0x0c: - NOTICE("meta event 0x0c (Text Event, Ignored)\n"); + NOTICE("meta event 0x0c (Text Event, Ignored)"); break; case 0x0d: - NOTICE("meta event 0x0d (Text Event, Ignored)\n"); + NOTICE("meta event 0x0d (Text Event, Ignored)"); break; case 0x0e: - NOTICE("meta event 0x0e (Text Event, Ignored)\n"); + NOTICE("meta event 0x0e (Text Event, Ignored)"); break; case 0x0f: - NOTICE("meta event 0x0f (Text Event, Ignored)\n"); + NOTICE("meta event 0x0f (Text Event, Ignored)"); break; case 0x2f: /* EOF */ @@ -327,19 +327,19 @@ static void metaevent(int type) { midi_tempo(to32bit(0, m[0], m[1], m[2])); break; case 0x54: - NOTICE("set smpte\n"); + NOTICE("set smpte"); break; case 0x58: - NOTICE("time sig (Ignore)\n"); + NOTICE("time sig (Ignore)"); break; case 0x59: - NOTICE("keysig (Ignore)\n"); + NOTICE("keysig (Ignore)"); break; case 0x7f: - NOTICE("seq specific\n"); + NOTICE("seq specific"); break; default: - NOTICE("meta misc\n"); + NOTICE("meta misc"); break; } } @@ -527,7 +527,7 @@ static int read_header(BYTE *stream, off_t len) { midi->ntrks = Read16(); midi->division = Read16(); } else { - WARNING("unknow format\n"); + WARNING("unknow format"); return NG; } } @@ -537,12 +537,12 @@ static int read_header(BYTE *stream, off_t len) { return NG; } - NOTICE("tracklen = %d, format = %d, ntrks = %d, division = %d\n", + NOTICE("tracklen = %d, format = %d, ntrks = %d, division = %d", tracklen, midi->format, midi->ntrks, midi->division); i = Read32(); if (i != MTrk) { - WARNING("Unknow format\n"); + WARNING("Unknow format"); } tracklen = Read32(); diff --git a/src/mmap.c b/src/mmap.c index b693109..4d1622a 100644 --- a/src/mmap.c +++ b/src/mmap.c @@ -107,13 +107,13 @@ int unmap_file(mmap_t *m) { mmap_t *map_file(const char *path) { int fd = open(path, O_RDONLY); if (fd < 0) { - WARNING("open: %s\n", strerror(errno)); + WARNING("open: %s", strerror(errno)); return NULL; } struct stat sbuf; if (fstat(fd, &sbuf) < 0) { - WARNING("fstat: %s\n", strerror(errno)); + WARNING("fstat: %s", strerror(errno)); close(fd); return NULL; } @@ -121,7 +121,7 @@ mmap_t *map_file(const char *path) { #ifdef HAVE_MMAP void *addr = mmap(0, sbuf.st_size, PROT_READ, MAP_SHARED, fd, 0); if (addr == MAP_FAILED) { - WARNING("mmap: %s\n", strerror(errno)); + WARNING("mmap: %s", strerror(errno)); close(fd); return NULL; } @@ -135,7 +135,7 @@ mmap_t *map_file(const char *path) { while (bytes < sbuf.st_size) { ssize_t ret = read(fd, addr + bytes, sbuf.st_size - bytes); if (ret <= 0) { - WARNING("read: %s\n", strerror(errno)); + WARNING("read: %s", strerror(errno)); close(fd); free(addr); return NULL; @@ -157,19 +157,19 @@ mmap_t *map_file_readwrite(const char *path, size_t size) { #else int fd = open(path, O_RDWR | O_CREAT, 0644); if (fd < 0) { - WARNING("open: %s\n", strerror(errno)); + WARNING("open: %s", strerror(errno)); return NULL; } if (ftruncate(fd, size) < 0) { - WARNING("ftruncate: %s\n", strerror(errno)); + WARNING("ftruncate: %s", strerror(errno)); close(fd); return NULL; } void *addr = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); if (addr == MAP_FAILED) { - WARNING("mmap: %s\n", strerror(errno)); + WARNING("mmap: %s", strerror(errno)); close(fd); return NULL; } diff --git a/src/pcm.sdlmixer.c b/src/pcm.sdlmixer.c index d3cab95..8d03890 100644 --- a/src/pcm.sdlmixer.c +++ b/src/pcm.sdlmixer.c @@ -66,14 +66,14 @@ static mmap_t *wai_map; Mix_Chunk *pcm_sdlmixer_load(int no) { dridata *dfile = ald_getdata(DRIFILE_WAVE, no -1); if (dfile == NULL) { - WARNING("DRIFILE_WAVE fail to open %d\n", no -1); + WARNING("DRIFILE_WAVE fail to open %d", no -1); return NULL; } Mix_Chunk *chunk = Mix_LoadWAV_RW(SDL_RWFromConstMem(dfile->data, dfile->size), 1); ald_freedata(dfile); if (chunk == NULL) { - WARNING("DRIFILE_WAVE %d: not a valid wav file\n", no-1); + WARNING("DRIFILE_WAVE %d: not a valid wav file", no-1); return NULL; } assert(chunk->allocated); @@ -325,7 +325,7 @@ static int load_wai() { char *adr = wai_map->addr; if (*adr != 'X' || *(adr+1) != 'I' || *(adr+2) != '2') { - WARNING("not WAI file\n"); + WARNING("not WAI file"); unmap_file(wai_map); wai_map = NULL; return NG; diff --git a/src/qnt.c b/src/qnt.c index 2ebf9aa..fc71376 100644 --- a/src/qnt.c +++ b/src/qnt.c @@ -90,7 +90,7 @@ static void extract_pixel(qnt_header *qnt, BYTE *pic, BYTE *b) { BYTE *raw = malloc(sizeof(BYTE) * ucbuf); if (Z_OK != uncompress(raw, &ucbuf, b, qnt->pixel_size)) { - WARNING("uncompress failed\n"); + WARNING("uncompress failed"); free(raw); return; } @@ -172,7 +172,7 @@ static void extract_alpha(qnt_header *qnt, BYTE *pic, BYTE *b) { BYTE *raw = malloc(sizeof(BYTE) * ucbuf); if (Z_OK != uncompress(raw, &ucbuf, b, qnt->alpha_size)) { - WARNING("uncompress failed\n"); + WARNING("uncompress failed"); free(raw); return; } diff --git a/src/s39ain.c b/src/s39ain.c index ab33f1a..70e1d83 100644 --- a/src/s39ain.c +++ b/src/s39ain.c @@ -44,7 +44,7 @@ int s39ain_init(const char *path_to_ain, S39AIN *ain) { int i; if (NULL == (fp = fopen(path_to_ain, "rb"))) { - WARNING("fail to open %s\n", path_to_ain); + WARNING("fail to open %s", path_to_ain); return NG; } @@ -58,7 +58,7 @@ int s39ain_init(const char *path_to_ain, S39AIN *ain) { p = buf; /* first check */ if (0 != strncmp(p, "AIN", 3)) { - WARNING("%s is not ain file\n", path_to_ain); + WARNING("%s is not ain file", path_to_ain); free(buf); return NG; } @@ -75,7 +75,7 @@ int s39ain_init(const char *path_to_ain, S39AIN *ain) { p = buf +8; if (0 != strncmp(p, "HEL0", 4)) { - WARNING("%s is illigal ain file\n", path_to_ain); + WARNING("%s is illigal ain file", path_to_ain); free(buf); return NG; } diff --git a/src/s39init.c b/src/s39init.c index 16e89c1..11bc3b2 100644 --- a/src/s39init.c +++ b/src/s39init.c @@ -66,7 +66,7 @@ int s39ini_init(void) { s1[strlen(s1)-1] = '\0'; // remove last '"' vval[i].label = sjis2utf(s1); vval_max = max(vval_max, i); - //WARNING("VolumeValancer[%d] = %s\n", i, vval[i].label); + //WARNING("VolumeValancer[%d] = %s", i, vval[i].label); } if (vval_max <= 0) return NG; @@ -144,7 +144,7 @@ int s39ini_remove() { snprintf(fn, sizeof(fn) -1, "%s/Volume.sav", nact->files.save_path); if (NULL == (fp = fopen(fn, "wb"))) { - WARNING("Fail to save Volume.save\n"); + WARNING("Fail to save Volume.save"); return NG; } diff --git a/src/savedata.c b/src/savedata.c index e12c3cc..ef358b6 100644 --- a/src/savedata.c +++ b/src/savedata.c @@ -84,7 +84,7 @@ int save_vars_to_file(char *fname_utf8, struct VarRef *src, int cnt) { return SAVE_SAVEERR; if (cnt > v_sliceSize(src)) { - WARNING("QE: array size too small (size = %d, data count = %d)\n", v_sliceSize(src), cnt); + WARNING("QE: array size too small (size = %d, data count = %d)", v_sliceSize(src), cnt); cnt = v_sliceSize(src); } @@ -107,7 +107,7 @@ int load_vars_from_file(char *fname_utf8, struct VarRef *dest, int cnt) { WORD *tmp = malloc(cnt * sizeof(WORD)); if (!tmp) { - WARNING("Out of memory\n"); + WARNING("Out of memory"); fclose(fp); return SAVE_LOADERR; } @@ -122,7 +122,7 @@ int load_vars_from_file(char *fname_utf8, struct VarRef *dest, int cnt) { } if (cnt > v_sliceSize(dest)) { - WARNING("LE: array size too small (size = %d, data count = %d)\n", v_sliceSize(dest), cnt); + WARNING("LE: array size too small (size = %d, data count = %d)", v_sliceSize(dest), cnt); cnt = v_sliceSize(dest); } @@ -143,7 +143,7 @@ int save_save_str_with_file(char *fname_utf8, int start, int cnt) { _tmp = tmp = malloc(svar_maxindex() * strvar_len); if (tmp == NULL) { - WARNING("Out of memory\n"); + WARNING("Out of memory"); return SAVE_LOADSHORTAGE; } @@ -193,7 +193,7 @@ int save_load_str_with_file(char *fname_utf8, int start, int cnt) { tmp = _tmp = (char *)malloc(filesize); if (tmp == NULL) { - WARNING("Out of memory\n"); + WARNING("Out of memory"); return SAVE_LOADERR; } @@ -548,7 +548,7 @@ static void *saveStrVar(Ald_strVarHdr *head) { char *tmp, *_tmp; _tmp = tmp = malloc(svar_maxindex() * strvar_len); if (tmp == NULL) { - WARNING("Out of memory\n"); + WARNING("Out of memory"); return NULL; } *tmp = 0; @@ -572,7 +572,7 @@ static void loadStrVar(char *buf) { cnt = head->count; max = head->maxlen; if (svar_maxindex() != cnt || strvar_len != max) { - WARNING("Unexpected number of strings in savedata (%d, expected %d)\n", cnt, svar_maxindex()); + WARNING("Unexpected number of strings in savedata (%d, expected %d)", cnt, svar_maxindex()); svar_init(cnt, max); } buf += sizeof(Ald_strVarHdr); @@ -599,7 +599,7 @@ static void *saveSysVar(Ald_sysVarHdr *head, int page) { head->pageNo = page; tmp = _tmp = (WORD *)malloc(cnt * sizeof(WORD)); if (tmp == NULL) { - WARNING("Out of memory\n"); + WARNING("Out of memory"); return NULL; } for (i = 0; i < cnt; i++) { @@ -621,7 +621,7 @@ static int loadSysVar(char *buf) { savefile_sysvar_cnt = cnt; if (varPage[page].size < cnt || varPage[page].value == NULL) { if (!v_allocatePage(page, cnt, TRUE)) { - WARNING("Array allocation failed: page=%d size=%d\n", page, cnt); + WARNING("Array allocation failed: page=%d size=%d", page, cnt); return SAVE_LOADERR; } } @@ -713,7 +713,7 @@ BYTE* load_cg_with_file(char *fname_utf8, int *status, long *filesize){ tmp = (char *)malloc(*filesize); if (tmp == NULL) { - WARNING("Out of memory\n"); + WARNING("Out of memory"); *status = SAVE_LOADERR; return NULL; } fseek(fp, 0L, SEEK_SET); diff --git a/src/scenario.c b/src/scenario.c index b494912..0219010 100644 --- a/src/scenario.c +++ b/src/scenario.c @@ -279,7 +279,7 @@ void sl_retFar(void) { while (*tmp != STACK_FARJMP) { if (*tmp == STACK_NEARJMP) { - WARNING("Stack buffer is illegal\n"); + WARNING("Stack buffer is illegal"); } else if (*tmp == STACK_DATA) { popDatas(tmp); } else if (*tmp == STACK_VARIABLE) { @@ -402,13 +402,13 @@ void sl_popVar(struct VarRef *vref, int cnt) { SYSERROR("Stack buffer is illegal"); } if (*(tmp + 2) != vref->page){ - WARNING("Variable is not match with stacked variable\n"); + WARNING("Variable is not match with stacked variable"); } if (*(tmp + 3) != vref->index) { - WARNING("Variable is not match with stacked variable\n"); + WARNING("Variable is not match with stacked variable"); } if (*(tmp + 1) != cnt + 2) { - WARNING("Variable count is not match with stacked variable\n"); + WARNING("Variable count is not match with stacked variable"); } memcpy(v_resolveRef(vref), tmp + 4, sizeof(int) * cnt); free(tmp); @@ -423,7 +423,7 @@ static void popVars(int *tmp) { index = *(tmp + 3); if (!varPage[page].value) { - WARNING("Illegal Variable pop\n"); + WARNING("Illegal Variable pop"); return; } topVar = &varPage[page].value[index]; @@ -465,7 +465,7 @@ void sl_popData(int *data, int cnt) { if (*tmp != STACK_DATA) SYSERROR("Stack buffer is illegal"); if (*(tmp + 1) != cnt) - WARNING("Variable count is not match with stacked variable\n"); + WARNING("Variable count is not match with stacked variable"); memcpy(data, tmp + 2, sizeof(int) * cnt); free(tmp); @@ -477,7 +477,7 @@ static void popDatas(int *tmp) { int d3 = *(tmp + 4); if (*(tmp + 1) != 3) - WARNING("Variable count is not match with stacked variable\n"); + WARNING("Variable count is not match with stacked variable"); switch(d1) { case TxxTEXTCOLOR: diff --git a/src/scenario.h b/src/scenario.h index 809c80e..0b6295f 100644 --- a/src/scenario.h +++ b/src/scenario.h @@ -87,9 +87,9 @@ static inline int sl_getc(void) { return sl_sco[sl_index++]; } #ifdef DEBUG #define DEBUG_COMMAND_YET(fmt, ...) \ - sys_message(2, "%d,%x: " fmt, sl_getPage(), sl_getIndex(), ##__VA_ARGS__) + sys_message(2, "%d,%x: " fmt "\n", sl_getPage(), sl_getIndex(), ##__VA_ARGS__) #define DEBUG_COMMAND(fmt, ...) \ - sys_message(5, "%d,%x: " fmt, sl_getPage(), sl_getIndex(), ##__VA_ARGS__) + sys_message(5, "%d,%x: " fmt "\n", sl_getPage(), sl_getIndex(), ##__VA_ARGS__) #define DEBUG_MESSAGE(...) sys_message(6, __VA_ARGS__) #else #define DEBUG_COMMAND(...) diff --git a/src/sdl_cursor.c b/src/sdl_cursor.c index 594a935..c8bc7f6 100644 --- a/src/sdl_cursor.c +++ b/src/sdl_cursor.c @@ -105,7 +105,7 @@ boolean sdl_cursorNew(BYTE* data, int no, CursorImage *cursorImage, TCursorDirEn xornum = (cursordirentry->bWidth * cursordirentry->bHeight); xormasklen = (xornum * cursorImage->icHeader.biBitCount) / 8; - NOTICE("Cursor: xormasklen==%d, xornum==%d\n", xormasklen, xornum); + NOTICE("Cursor: xormasklen==%d, xornum==%d", xormasklen, xornum); andmasklen = xornum / 8; cursorImage->xormasklen = xormasklen; diff --git a/src/sdl_draw.c b/src/sdl_draw.c index 2931b44..89a3120 100644 --- a/src/sdl_draw.c +++ b/src/sdl_draw.c @@ -292,7 +292,7 @@ SDL_Rect sdl_floodFill(int x, int y, int c) { case 4: return sdl_floodFill___DWORD(x, y, col); default: - WARNING("sdl_floodFill: unsupported DIB format\n"); + WARNING("sdl_floodFill: unsupported DIB format"); return (SDL_Rect){}; } } diff --git a/src/sdl_effect.c b/src/sdl_effect.c index 54523d5..80d1e8b 100644 --- a/src/sdl_effect.c +++ b/src/sdl_effect.c @@ -203,7 +203,7 @@ static void crossfade_free(struct sdl_effect *eff) { } static struct sdl_effect *fallback_effect_new(SDL_Rect *rect, SDL_Surface *old, SDL_Surface *new, enum sdl_effect_type type) { - WARNING("Effect %d is not supported in this system. Falling back to crossfade.\n", type); + WARNING("Effect %d is not supported in this system. Falling back to crossfade.", type); return crossfade_new(rect, old, new); } @@ -1622,7 +1622,7 @@ struct sdl_effect *sdl_effect_init(SDL_Rect *rect, agsurface_t *old, int ox, int case EFFECT_ZIGZAG_CROSSFADE: return zigzag_crossfade_new(rect, sf_old, sf_new); default: - WARNING("Unknown effect %d\n", type); + WARNING("Unknown effect %d", type); return crossfade_new(rect, sf_old, sf_new); } } diff --git a/src/sdl_event.c b/src/sdl_event.c index 01b7bf3..541d9b4 100644 --- a/src/sdl_event.c +++ b/src/sdl_event.c @@ -263,7 +263,7 @@ static void sdl_getEvent(void) { break; default: - NOTICE("ev %x\n", e.type); + NOTICE("ev %x", e.type); break; } } diff --git a/src/sdl_video.c b/src/sdl_video.c index 1166e30..d3c4988 100644 --- a/src/sdl_video.c +++ b/src/sdl_video.c @@ -57,7 +57,7 @@ boolean sdl_joy_open(int index) { int axes = SDL_JoystickNumAxes(js); int buttons = SDL_JoystickNumButtons(js); SDL_JoystickEventState(SDL_ENABLE); - NOTICE("SDL joystick '%s' %d axes %d buttons\n", name, axes, buttons); + NOTICE("SDL joystick '%s' %d axes %d buttons", name, axes, buttons); return TRUE; } @@ -111,7 +111,7 @@ void sdl_Remove(void) { SDL_Quit(); - NOTICE("Done!\n"); + NOTICE("Done!"); } } diff --git a/src/system.h b/src/system.h index 3e717fc..2273eaa 100644 --- a/src/system.h +++ b/src/system.h @@ -46,14 +46,15 @@ extern void sys_message(int lv, char *format, ...); /* show various message */ #endif /* DEBUG */ #define NOMEMERR() sys_error("Out of memory at %s()\n", __func__) -#define NOTICE(...) sys_message(2, __VA_ARGS__) #define SYSERROR(fmt, ...) \ sys_error("*ERROR*(%s): " fmt, __func__, ##__VA_ARGS__) #define WARNING(fmt, ...) \ - sys_message(1, "*WARNING*(%s): " fmt, __func__, ##__VA_ARGS__) + sys_message(1, "*WARNING*(%s): " fmt "\n", __func__, ##__VA_ARGS__) +#define NOTICE(fmt, ...) \ + sys_message(2, fmt "\n", ##__VA_ARGS__) #define SACT_DEBUG(fmt, ...) \ - sys_message(5, "%s: " fmt, __func__, ##__VA_ARGS__) + sys_message(5, "%s: " fmt "\n", __func__, ##__VA_ARGS__) #ifdef HAVE_SIGACTION void sys_set_signalhandler(int SIG, void (*handler)(int)); diff --git a/src/variable.c b/src/variable.c index 2d11930..e70653b 100644 --- a/src/variable.c +++ b/src/variable.c @@ -204,7 +204,7 @@ void v_reset(void) { /* 文字変数への代入 */ void svar_set(int no, const char *str) { if ((unsigned)no >= strvar_cnt) { - WARNING("string index out of range: %d\n", no); + WARNING("string index out of range: %d", no); return; } if (strVar[no]) @@ -214,7 +214,7 @@ void svar_set(int no, const char *str) { void svar_copy(int dstno, int dstpos, int srcno, int srcpos, int len) { if ((unsigned)dstno >= strvar_cnt) { - WARNING("string index out of range: %d\n", dstno); + WARNING("string index out of range: %d", dstno); return; } if (!strVar[dstno]) @@ -242,7 +242,7 @@ void svar_copy(int dstno, int dstpos, int srcno, int srcpos, int len) { /* 文字変数への接続 */ void svar_append(int no, const char *str) { if ((unsigned)no >= strvar_cnt) { - WARNING("string index out of range: %d\n", no); + WARNING("string index out of range: %d", no); return; } if (!strVar[no]) { @@ -275,7 +275,7 @@ int svar_width(int no) { /* 文字変数そのもの */ const char *svar_get(int no) { if ((unsigned)no >= strvar_cnt) { - WARNING("string index out of range: %d\n", no); + WARNING("string index out of range: %d", no); return ""; } return strVar[no] ? strVar[no] : ""; @@ -283,7 +283,7 @@ const char *svar_get(int no) { int svar_find(int no, int start, const char *str) { if ((unsigned)no >= strvar_cnt) { - WARNING("string index out of range: %d\n", no); + WARNING("string index out of range: %d", no); return -1; } if (!*str) @@ -304,7 +304,7 @@ int svar_find(int no, int start, const char *str) { void svar_fromVars(int no, const int *vars) { if ((unsigned)no >= strvar_cnt) { - WARNING("string index out of range: %d\n", no); + WARNING("string index out of range: %d", no); return; } int len = 0; @@ -328,7 +328,7 @@ void svar_fromVars(int no, const int *vars) { int svar_toVars(int no, int *vars) { if ((unsigned)no >= strvar_cnt) { - WARNING("string index out of range: %d\n", no); + WARNING("string index out of range: %d", no); return 0; } if (!strVar[no]) { @@ -362,7 +362,7 @@ void svar_replaceAll(int no, int pattern, int replacement) { const char *repl = svar_get(replacement); if ((unsigned)no >= strvar_cnt) { - WARNING("string index out of range: %d\n", no); + WARNING("string index out of range: %d", no); return; } if (!strVar[no]) diff --git a/src/webp.c b/src/webp.c index 69a0822..cd3147a 100644 --- a/src/webp.c +++ b/src/webp.c @@ -71,7 +71,7 @@ static uint8_t *webp_load(uint8_t *data, size_t size, int *width, int *height, i dridata *dfile = ald_getdata(DRIFILE_CG, base - 1); if (!dfile) { - WARNING("Cannot load base CG %d\n", base - 1); + WARNING("Cannot load base CG %d", base - 1); return pixels; } @@ -79,11 +79,11 @@ static uint8_t *webp_load(uint8_t *data, size_t size, int *width, int *height, i uint8_t *base_pixels = webp_load(dfile->data, dfile->size, &base_width, &base_height, &base_has_alpha); ald_freedata(dfile); if (!base_pixels) { - WARNING("Cannot decode base CG %d\n", base - 1); + WARNING("Cannot decode base CG %d", base - 1); return pixels; } if (*width != base_width || *height != base_height) { - WARNING("webp base CG dimensions don't match: (%d,%d) / (%d,%d)\n", + WARNING("webp base CG dimensions don't match: (%d,%d) / (%d,%d)", base_width, base_height, *width, *height); WebPFree(base_pixels); return pixels;