aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2006-02-23 10:35:33 +0000
committerTravis Howell2006-02-23 10:35:33 +0000
commit8fa8d10c3f82cf158b658e33279bc9db94276105 (patch)
treea79d9347b18cf401b6500acf28b182750213624a
parent901edf5b338ff39ee242ff4ef484536263b14c94 (diff)
downloadscummvm-rg350-8fa8d10c3f82cf158b658e33279bc9db94276105.tar.gz
scummvm-rg350-8fa8d10c3f82cf158b658e33279bc9db94276105.tar.bz2
scummvm-rg350-8fa8d10c3f82cf158b658e33279bc9db94276105.zip
Fix a few compile warnings.
svn-id: r20824
-rw-r--r--engines/cine/anim.cpp8
-rw-r--r--engines/cine/prc.h2
-rw-r--r--engines/cine/various.cpp4
3 files changed, 7 insertions, 7 deletions
diff --git a/engines/cine/anim.cpp b/engines/cine/anim.cpp
index 754e26ec2a..eb113b9190 100644
--- a/engines/cine/anim.cpp
+++ b/engines/cine/anim.cpp
@@ -838,8 +838,8 @@ void loadSeqAbs(char *resourceName, uint16 idx) {
}
void loadResource(char *resourceName) {
- uint8 isMask = 0;
- uint8 isSpl = 0;
+ /* uint8 isMask = 0; */
+ /* uint8 isSpl = 0; */
if (strstr(resourceName, ".SPL")) {
loadSpl(resourceName);
@@ -871,8 +871,8 @@ void loadResource(char *resourceName) {
}
void loadAbs(char *resourceName, uint16 idx) {
- uint8 isMask = 0;
- uint8 isSpl = 0;
+ /* uint8 isMask = 0; */
+ /* uint8 isSpl = 0; */
if (strstr(resourceName, ".SET")) {
loadSetAbs(resourceName, idx);
diff --git a/engines/cine/prc.h b/engines/cine/prc.h
index 4345913e98..0c80ef79dd 100644
--- a/engines/cine/prc.h
+++ b/engines/cine/prc.h
@@ -42,6 +42,6 @@ extern prcLinkedListStruct objScriptList;
void resetglobalScriptsHead(void);
void freePrcLinkedList(void);
-void loadPrc(char *pPrcName);
+void loadPrc(const char *pPrcName);
#endif
diff --git a/engines/cine/various.cpp b/engines/cine/various.cpp
index 15877f73e0..e677dbd036 100644
--- a/engines/cine/various.cpp
+++ b/engines/cine/various.cpp
@@ -41,7 +41,7 @@ uint16 var3;
uint16 var4;
uint16 var5;
-void drawString(char *string, uint8 param) {
+void drawString(const char *string, uint8 param) {
}
void blitRawScreen(uint8 *frontBuffer) {
@@ -2385,12 +2385,12 @@ uint16 executePlayerInput(void) {
void drawSprite(overlayHeadElement *currentOverlay, uint8 *spritePtr,
uint8 *maskPtr, uint16 width, uint16 height, uint8 *page, int16 x, int16 y) {
+#if 0
uint8 *ptr = NULL;
uint8 i = 0;
uint16 si = 0;
overlayHeadElement *pCurrentOverlay = currentOverlay;
-#if 0
while(pCurrentOverlay) { // unfinished, probably for mask handling..
if (pCurrentOverlay->type == 5) {
int16 maskX;