[Scummvm-cvs-logs] CVS: residual scene.cpp,1.3,1.4

Vincent Hamm yazoo at users.sourceforge.net
Sat Aug 16 17:13:01 CEST 2003


Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1:/tmp/cvs-serv20836

Modified Files:
	scene.cpp 
Log Message:
Commented a bit the walkplane (sectors).
Fixed the flags


Index: scene.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/scene.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- scene.cpp	16 Aug 2003 06:41:37 -0000	1.3
+++ scene.cpp	17 Aug 2003 00:12:02 -0000	1.4
@@ -71,7 +71,7 @@
   delete [] cmaps_;
   delete [] setups_;
   delete [] lights_;
-  delete [] sectors_;
+  delete [] sectors_; // Endy<-yaz: if I remember well, sometime sectors aren't allocated... (inventory room)
 }
 
 void Scene::Sector::load(TextSplitter &ts) {
@@ -85,6 +85,7 @@
 void Scene::Sector::load0(TextSplitter &ts, char *name, int id) {
   char buf[256];
   int i = 0;
+  float height = 12345.f; // Yaz: this is in the original code...
   Vector3d tempVert;
 
   name_ = name;
@@ -92,16 +93,19 @@
   ts.scanString(" type %256s", 1, buf);
 
   // FIXME: I don't think these are right (see grim loc_4A7D19, result is var_200?)
+  // Yaz: actualy, those should be flags that are later used function at 4A66C0 (I named it buildWalkPlane)
+
+  
   if (strstr(buf, "walk"))
-   type_ = 1;
+   type_ = 0x1000;
   else if (strstr(buf, "funnel"))
-   type_ = 3; // ??
+   type_ = 0x1100; 
   else if (strstr(buf, "camera"))
-   type_ = 2;
+   type_ = 0x2000;
   else if (strstr(buf, "special"))
-   type_ = 4;
+   type_ = 0x4000;
   else if (strstr(buf, "chernobyl"))
-   type_ = 0;
+   type_ = 0x8000;
   else
    error("Unknown sector type '%s' in room setup", buf);
 
@@ -118,6 +122,7 @@
 
 void Scene::Setup::load(TextSplitter &ts) {
   char buf[256];
+
   ts.scanString(" setup %256s", 1, buf);
   name_ = buf;
 





More information about the Scummvm-git-logs mailing list