cpp/openttd-patchpack/source Changeset - r18271:48f58f5efce8

Changeset - r18271:48f58f5efce8

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

yexo - 13 years ago 2011-11-04 23:14:23
yexo@openttd.org

(svn r23117) -Fix: [NoAI] calling require() to include a file gave you 100.000 opcodes for free

2 files changed with 10 insertions and 6 deletions:

bin/ai/regression/regression.txt

src/script/squirrel.cpp

0 comments (0 inline, 0 general)

bin/ai/regression/regression.txt

➞

Show inline comments

@@ @@ -8602,27 +8602,27 @@ ERROR: IsEnd() is invalid as Begin() is @@
   BuildVehicle():       16
   IsValidVehicle(16):   true
   IsInDepot(16):        true
   IsStoppedInDepot(16): true
   BuildRailDepot():     true
   BuildVehicle():       17
   BuildVehicle():       18
   BuildVehicle():       19
   MoveWagonChain():     true
   GetNumWagons():       3
   GetLength():          24
   GetWagonEngineType(): 9
-  GetWagonAge():        0
+  GetWagonAge():        1
   GetWagonEngineType(): 27
-  GetWagonAge():        0
+  GetWagonAge():        1
   GetWagonEngineType(): 27
   GetWagonAge():        0
   GetWagonEngineType(): 65535
   GetWagonAge():        -1
   --Errors--
     RefitVehicle():        false
     GetLastErrorString():  ERR_VEHICLE_NOT_IN_DEPOT
     SellVehicle():         false
     GetLastErrorString():  ERR_VEHICLE_NOT_IN_DEPOT
     SendVehicleToDepot():  false
     GetLastErrorString():  ERR_UNKNOWN
@@ @@ -8638,39 +8638,39 @@ ERROR: IsEnd() is invalid as Begin() is @@
 => 219
 => 204
 => 153
 => 153
 => 9
   UnitNumber ListDump:
 => 2
 => 1
 => 1
 => 1
 => 1
   Age ListDump:
 => 1
 => 1
 => 1
 => 1
 => 1
 => 0
 => 0
   MaxAge ListDump:
 => 10980
 => 10980
 => 7320
 => 5490
 => 5490
   AgeLeft ListDump:
-=> 10980
+=> 10979
 => 10979
-=> 7320
+=> 7319
 => 5489
 => 5489
   CurrentSpeed ListDump:
 => 21
 => 0
 => 0
 => 0
 => 0
   RunningCost ListDump:
 => 2756
 => 2296
 => 2296

src/script/squirrel.cpp

➞

Show inline comments

@@ @@ -472,33 +472,37 @@ static SQInteger _io_file_read(SQUserPoi @@
+		}
 		FioFCloseFile(file);
 		return SQ_ERROR;
+	}
 	return sq_throwerror(vm, _SC("cannot open the file"));
+}
 /* static */ bool Squirrel::LoadScript(HSQUIRRELVM vm, const char *script, bool in_root)
+{
 	/* Make sure we are always in the root-table */
 	if (in_root) sq_pushroottable(vm);
 	SQInteger ops_left = vm->_ops_till_suspend;
 	/* Load and run the script */
 	if (SQ_SUCCEEDED(LoadFile(vm, script, SQTrue))) {
 		sq_push(vm, -2);
 		if (SQ_SUCCEEDED(sq_call(vm, 1, SQFalse, SQTrue, 100000))) {
 			sq_pop(vm, 1);
 			/* After compiling the file we want to reset the amount of opcodes. */
 			vm->_ops_till_suspend = ops_left;
 			return true;
+		}
+	}
 	vm->_ops_till_suspend = ops_left;
 	DEBUG(misc, 0, "[squirrel] Failed to compile '%s'", script);
 	return false;
+}
 bool Squirrel::LoadScript(const char *script)
+{
 	return LoadScript(this->vm, script);
+}
 Squirrel::~Squirrel()
+{
 	/* Clean up the stuff */

0 comments (0 inline, 0 general)