libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-10 20:01:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed some warnings

Browse Source
This commit is contained in:
Pawel Kolodziejski 2004-10-06 18:59:23 +00:00
parent e2dcfbfd44
commit aa87a161b6
6 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actor.cpp
View File

@ -34,7 +34,7 @@ Actor::Actor(const char *name) :
pitch_(0), yaw_(0), roll_(0), walkRate_(0), turnRate_(0),
visible_(true), talkSound_(NULL), lipSynch_(NULL), turning_(false), walking_(false),
restCostume_(NULL), restChore_(-1),
walkCostume_(NULL), walkChore_(-1), walkedLast_(false), walkedCur_(-1),
walkCostume_(NULL), walkChore_(-1), walkedLast_(false), walkedCur_(false),
turnCostume_(NULL), leftTurnChore_(-1), rightTurnChore_(-1),
lastTurnDir_(0), currTurnDir_(0),
mumbleCostume_(NULL), mumbleChore_(-1) {

2
bits.h
View File

@ -48,6 +48,8 @@ template<typename T> inline T MAX (T a, T b) { return (a>b) ? a : b; }
#define snprintf _snprintf
#define ZLIB_WINAPI
#if defined(CHECK_HEAP)
#undef CHECK_HEAP
#define CHECK_HEAP checkHeap();

3
lipsynch.h
View File

@ -41,7 +41,7 @@ private:
int numEntries_;
int currEntry_;
bool status_;
struct PhonemeAnim {
uint16 phoneme;
uint16 anim;
@ -51,3 +51,4 @@ private:
};
#endif

2
lua.h
View File

@ -18,12 +18,10 @@
#ifndef LUA_HH
#define LUA_HH
extern "C" {
#include <lua.h>
#include <lualib.h>
#include <luadebug.h>
#include <lauxlib.h>
}
// Register Residual builtin functions and structures
void register_lua();

4
matrix3.cpp
View File

@ -42,11 +42,11 @@ void Matrix3::buildFromPitchYawRoll(float pitch, float yaw, float roll) {
#define RADTODEG(a) (a * 180.0 / MYPI)
float RadianToDegree(float rad) {
return RADTODEG(rad);
return (float)RADTODEG(rad);
}
float DegreeToRadian(float degrees) {
return DEGTORAD(degrees);
return (float)DEGTORAD(degrees);
}
// right

2
resource.cpp
View File

@ -68,7 +68,7 @@ ResourceLoader::ResourceLoader() {
Lab *l = new Lab(fullname.c_str());
lab_counter++;
if (l->isOpen())
if (strstr(de->d_name, "005"))
if (strstr(find_file_data.cFileName, "005"))
labs_.push_front(l);
else
labs_.push_back(l);