mirror of
https://github.com/libretro/scummvm.git
synced 2025-02-21 03:31:40 +00:00
Fixing compilation for me
svn-id: r26610
This commit is contained in:
parent
8c829072a9
commit
1ef6a1a7a1
@ -1077,4 +1077,4 @@ void processActors(void)
|
||||
}
|
||||
}
|
||||
}
|
||||
} // End of namespace Cruise
|
||||
} // End of namespace Cruise
|
||||
|
@ -33,7 +33,7 @@ enum animPhase
|
||||
ANIM_PHASE_STATIC = 1,
|
||||
ANIM_PHASE_MOVE = 2,
|
||||
ANIM_PHASE_STATIC_END = 3,
|
||||
ANIM_PHASE_END = 4,
|
||||
ANIM_PHASE_END = 4
|
||||
};
|
||||
|
||||
typedef enum animPhase animPhase;
|
||||
@ -71,4 +71,4 @@ void processActors(void);
|
||||
void getPixel(int x, int y);
|
||||
} // End of namespace Cruise
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
@ -61,4 +61,4 @@ int ctpProc2(int varX, int varY, int paramX, int paramY);
|
||||
|
||||
} // End of namespace Cruise
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
@ -34,7 +34,7 @@ enum fileTypeEnum
|
||||
type_UNK,
|
||||
type_SPL,
|
||||
type_SET,
|
||||
type_FNT,
|
||||
type_FNT
|
||||
};
|
||||
|
||||
typedef enum fileTypeEnum fileTypeEnum;
|
||||
|
@ -35,4 +35,4 @@ int loadFullBundle(uint8* name, int startIdx);
|
||||
|
||||
} // End of namespace Cruise
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
@ -121,7 +121,7 @@ int32 getTextLineCount(int32 rightBorder_X, int32 wordSpacingWidth, uint8* ptr,
|
||||
}
|
||||
}
|
||||
|
||||
void loadFNT(void* fileNameChar)
|
||||
void loadFNT(const void* fileNameChar)
|
||||
{
|
||||
uint8 header[6];
|
||||
int32 fontSize;
|
||||
|
@ -27,7 +27,7 @@
|
||||
|
||||
namespace Cruise {
|
||||
|
||||
void loadFNT(void* fileName);
|
||||
void loadFNT(const void* fileName);
|
||||
void loadSystemFont(void);
|
||||
|
||||
//////////////////////////////////////////////////
|
||||
@ -46,4 +46,4 @@ void drawString(int32 x, int32 y, uint8* string, uint8* buffer, uint8 color, int
|
||||
|
||||
} // End of namespace Cruise
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
@ -91,4 +91,4 @@ int16 getMultipleObjectParam(int16 overlayIdx,int16 objectIdx,objectParamsQuery*
|
||||
|
||||
} // End of namespace Cruise
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
@ -53,4 +53,4 @@ void affiche_chemin(int16 persoIdx, int16* returnVar);
|
||||
|
||||
} // End of namespace Cruise
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
@ -26,24 +26,24 @@
|
||||
|
||||
namespace Cruise {
|
||||
|
||||
void strcpyuint8(void* dest, void* source)
|
||||
void strcpyuint8(void* dest, const void* source)
|
||||
{
|
||||
strcpy((char*)dest,(char*)source);
|
||||
strcpy((char*)dest,(const char*)source);
|
||||
}
|
||||
|
||||
void strcatuint8(void* dest, void* source)
|
||||
void strcatuint8(void* dest, const void* source)
|
||||
{
|
||||
strcat((char*)dest,(char*)source);
|
||||
strcat((char*)dest,(const char*)source);
|
||||
}
|
||||
|
||||
uint8 strcmpuint8(void* string1, void* string2)
|
||||
uint8 strcmpuint8(const void* string1, const void* string2)
|
||||
{
|
||||
return strcmp((char*)string1,(char*)string2);
|
||||
}
|
||||
|
||||
FILE* fopenuint8(void* name, void* param)
|
||||
FILE* fopenuint8(void* name, const void* param)
|
||||
{
|
||||
return fopen((char*)name,(char*)param);
|
||||
return fopen((char*)name,(const char*)param);
|
||||
}
|
||||
|
||||
} // End of namespace Cruise
|
||||
|
@ -27,10 +27,10 @@
|
||||
|
||||
namespace Cruise {
|
||||
|
||||
void strcpyuint8(void* dest, void* source);
|
||||
void strcatuint8(void* dest, void* source);
|
||||
uint8 strcmpuint8(void* string1, void* string2);
|
||||
FILE* fopenuint8(void* name, void* param);
|
||||
void strcpyuint8(void* dest, const void* source);
|
||||
void strcatuint8(void* dest, const void* source);
|
||||
uint8 strcmpuint8(const void* string1, const void* string2);
|
||||
FILE* fopenuint8(void* name, const void* param);
|
||||
|
||||
} // End of namespace Cruise
|
||||
|
||||
|
@ -337,4 +337,4 @@ extern uint8 scaledScreen[640*400];
|
||||
|
||||
} // End of namespace Cruise
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
Loading…
x
Reference in New Issue
Block a user