[Scummvm-cvs-logs] CVS: residual actor.cpp,1.29,1.30 bits.h,1.15,1.16 lipsynch.h,1.1,1.2 lua.h,1.3,1.4 matrix3.cpp,1.5,1.6 resource.cpp,1.11,1.12
Pawel Kolodziejski
aquadran at users.sourceforge.net
Wed Oct 6 12:00:57 CEST 2004
Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12154
Modified Files:
actor.cpp bits.h lipsynch.h lua.h matrix3.cpp resource.cpp
Log Message:
fixed some warnings
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/actor.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- actor.cpp 11 Sep 2004 14:09:42 -0000 1.29
+++ actor.cpp 6 Oct 2004 18:59:23 -0000 1.30
@@ -34,7 +34,7 @@
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) {
Index: bits.h
===================================================================
RCS file: /cvsroot/scummvm/residual/bits.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- bits.h 2 May 2004 11:34:40 -0000 1.15
+++ bits.h 6 Oct 2004 18:59:23 -0000 1.16
@@ -48,6 +48,8 @@
#define snprintf _snprintf
+ #define ZLIB_WINAPI
+
#if defined(CHECK_HEAP)
#undef CHECK_HEAP
#define CHECK_HEAP checkHeap();
Index: lipsynch.h
===================================================================
RCS file: /cvsroot/scummvm/residual/lipsynch.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- lipsynch.h 11 Sep 2004 14:09:43 -0000 1.1
+++ lipsynch.h 6 Oct 2004 18:59:23 -0000 1.2
@@ -1,53 +1,54 @@
-// Residual - Virtual machine to run LucasArts' 3D adventure games
-// Copyright (C) 2003-2004 The ScummVM-Residual Team (www.scummvm.org)
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-#ifndef LIPSYNCH_H
-#define LIPSYNCH_H
-
-#include "bits.h"
-#include "resource.h"
-#include <list>
-
-class LipSynch : public Resource {
-public:
- LipSynch(const char *filename, const char *data, int len);
- ~LipSynch();
-
- struct LipEntry {
- uint16 frame;
- uint16 anim;
- };
-
- LipEntry getCurrEntry();
- void advanceEntry();
- bool getStatus() const { return status_; }
-
-private:
- LipEntry *entries_;
- int numEntries_;
- int currEntry_;
- bool status_;
-
- struct PhonemeAnim {
- uint16 phoneme;
- uint16 anim;
- };
- static const PhonemeAnim animTable_[];
- static const int animTableSize_;
-};
-
-#endif
+// Residual - Virtual machine to run LucasArts' 3D adventure games
+// Copyright (C) 2003-2004 The ScummVM-Residual Team (www.scummvm.org)
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+#ifndef LIPSYNCH_H
+#define LIPSYNCH_H
+
+#include "bits.h"
+#include "resource.h"
+#include <list>
+
+class LipSynch : public Resource {
+public:
+ LipSynch(const char *filename, const char *data, int len);
+ ~LipSynch();
+
+ struct LipEntry {
+ uint16 frame;
+ uint16 anim;
+ };
+
+ LipEntry getCurrEntry();
+ void advanceEntry();
+ bool getStatus() const { return status_; }
+
+private:
+ LipEntry *entries_;
+ int numEntries_;
+ int currEntry_;
+ bool status_;
+
+ struct PhonemeAnim {
+ uint16 phoneme;
+ uint16 anim;
+ };
+ static const PhonemeAnim animTable_[];
+ static const int animTableSize_;
+};
+
+#endif
+
Index: lua.h
===================================================================
RCS file: /cvsroot/scummvm/residual/lua.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- lua.h 3 Mar 2004 21:43:34 -0000 1.3
+++ lua.h 6 Oct 2004 18:59:23 -0000 1.4
@@ -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();
Index: matrix3.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/matrix3.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- matrix3.cpp 25 Feb 2004 08:45:56 -0000 1.5
+++ matrix3.cpp 6 Oct 2004 18:59:23 -0000 1.6
@@ -42,11 +42,11 @@
#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
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/resource.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- resource.cpp 11 Sep 2004 14:09:43 -0000 1.11
+++ resource.cpp 6 Oct 2004 18:59:23 -0000 1.12
@@ -68,7 +68,7 @@
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);
More information about the Scummvm-git-logs
mailing list