summaryrefslogtreecommitdiffstats
path: root/src/render
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-06-01 23:17:39 +0200
committeraap <aap@papnet.eu>2019-06-01 23:28:13 +0200
commitb63c87e8a619d448724d8532408973d850547d59 (patch)
treee75b7dfa53e02bd4feb33de0a90190279a8b5bab /src/render
parentadded CPointLights (diff)
downloadre3-b63c87e8a619d448724d8532408973d850547d59.tar
re3-b63c87e8a619d448724d8532408973d850547d59.tar.gz
re3-b63c87e8a619d448724d8532408973d850547d59.tar.bz2
re3-b63c87e8a619d448724d8532408973d850547d59.tar.lz
re3-b63c87e8a619d448724d8532408973d850547d59.tar.xz
re3-b63c87e8a619d448724d8532408973d850547d59.tar.zst
re3-b63c87e8a619d448724d8532408973d850547d59.zip
Diffstat (limited to 'src/render')
-rw-r--r--src/render/Credits.cpp2
-rw-r--r--src/render/Credits.h2
-rw-r--r--src/render/Sprite2d.cpp8
-rw-r--r--src/render/Sprite2d.h4
4 files changed, 8 insertions, 8 deletions
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);