From b63c87e8a619d448724d8532408973d850547d59 Mon Sep 17 00:00:00 2001 From: aap Date: Sat, 1 Jun 2019 23:17:39 +0200 Subject: implemented splashes; fixed zones --- src/render/Credits.cpp | 2 +- src/render/Credits.h | 2 +- src/render/Sprite2d.cpp | 8 ++++---- src/render/Sprite2d.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/render') diff --git a/src/render/Credits.cpp b/src/render/Credits.cpp index a8b10634..8365d02b 100644 --- a/src/render/Credits.cpp +++ b/src/render/Credits.cpp @@ -37,7 +37,7 @@ CCredits::PrintCreditSpace(float space, uint32 &line) } void -CCredits::PrintCreditText(float scaleX, float scaleY, wchar_t *text, uint32 &lineoffset, float scrolloffset) +CCredits::PrintCreditText(float scaleX, float scaleY, wchar *text, uint32 &lineoffset, float scrolloffset) { float start = SCREENH + 50.0f; float y = lineoffset + start - scrolloffset; diff --git a/src/render/Credits.h b/src/render/Credits.h index ed7f8a74..cbe63172 100644 --- a/src/render/Credits.h +++ b/src/render/Credits.h @@ -11,5 +11,5 @@ public: static bool AreCreditsDone(void) { return bCreditsGoing; } static void Render(void); static void PrintCreditSpace(float space, uint32 &line); - static void PrintCreditText(float scaleX, float scaleY, wchar_t *text, uint32 &lineoffset, float scrolloffset); + static void PrintCreditText(float scaleX, float scaleY, wchar *text, uint32 &lineoffset, float scrolloffset); }; diff --git a/src/render/Sprite2d.cpp b/src/render/Sprite2d.cpp index 3c699650..fd5900b8 100644 --- a/src/render/Sprite2d.cpp +++ b/src/render/Sprite2d.cpp @@ -78,7 +78,7 @@ CSprite2d::Delete(void) } void -CSprite2d::SetTexture(char *name) +CSprite2d::SetTexture(const char *name) { Delete(); if(name) @@ -86,7 +86,7 @@ CSprite2d::SetTexture(char *name) } void -CSprite2d::SetTexture(char *name, char *mask) +CSprite2d::SetTexture(const char *name, const char *mask) { Delete(); if(name) @@ -468,8 +468,8 @@ STARTPATCHES InjectHook(0x51EA00, &CSprite2d::Delete, PATCH_JUMP); InjectHook(0x51F950, &CSprite2d::SetRenderState, PATCH_JUMP); - InjectHook(0x51EA40, (void (CSprite2d::*)(char*))&CSprite2d::SetTexture, PATCH_JUMP); - InjectHook(0x51EA70, (void (CSprite2d::*)(char*,char*))&CSprite2d::SetTexture, PATCH_JUMP); + InjectHook(0x51EA40, (void (CSprite2d::*)(const char*))&CSprite2d::SetTexture, PATCH_JUMP); + InjectHook(0x51EA70, (void (CSprite2d::*)(const char*,const char*))&CSprite2d::SetTexture, PATCH_JUMP); InjectHook(0x51EAA0, &CSprite2d::SetAddressing, PATCH_JUMP); InjectHook(0x51EE90, (void (*)(const CRect&, C4, uint32))CSprite2d::SetVertices, PATCH_JUMP); diff --git a/src/render/Sprite2d.h b/src/render/Sprite2d.h index 1813d4ee..d5f0a5ae 100644 --- a/src/render/Sprite2d.h +++ b/src/render/Sprite2d.h @@ -23,8 +23,8 @@ public: ~CSprite2d(void) { Delete(); }; void Delete(void); void SetRenderState(void); - void SetTexture(char *name); - void SetTexture(char *name, char *mask); + void SetTexture(const char *name); + void SetTexture(const char *name, const char *mask); void SetAddressing(RwTextureAddressMode addr); void Draw(float x, float y, float w, float h, const CRGBA &col); void Draw(const CRect &rect, const CRGBA &col); -- cgit v1.2.3