Skip to content

Commit a926d28

Browse files
committed
the save/load gods demand fixing, and we must obey...
1 parent bd8eb98 commit a926d28

File tree

10 files changed

+312
-172
lines changed

10 files changed

+312
-172
lines changed

Data/Base.rte/Activities/Utility/BuyDoorHandler.lua

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
------- Require this in your script like so:
44

55
-- self.buyDoorHandler = require("Activities/Utility/BuyDoorHandler");
6-
-- self.buyDoorHandler:Initialize(Activity, bool newGame);
6+
-- self.buyDoorHandler:Initialize(Activity, bool newGame, bool verboseLogging);
77

88
-- This is a simple utility for activities to send orders to buy doors.
99
-- Create your items/actors beforehand and put them in a table.
@@ -41,9 +41,11 @@ function BuyDoorHandler:Create()
4141
return Members;
4242
end
4343

44-
function BuyDoorHandler:Initialize(activity, newGame)
45-
46-
print("buydoorhandlerinited")
44+
function BuyDoorHandler:Initialize(activity, newGame, verboseLogging)
45+
46+
if verboseLogging then
47+
self.verboseLogging = true;
48+
end
4749

4850
self.Activity = activity;
4951

@@ -61,20 +63,23 @@ function BuyDoorHandler:Initialize(activity, newGame)
6163

6264
end
6365

66+
print("INFO: BuyDoorHandler initialized!")
67+
6468
end
6569

6670
function BuyDoorHandler:OnLoad(saveLoadHandler)
6771

68-
print("loading buydoorhandler...");
72+
print("INFO: BuyDoorHandler loading...");
6973
self.buyDoorTable = saveLoadHandler:ReadSavedStringAsTable("buyDoorHandlerBuyDoorTable");
70-
print("loaded buydoorhandler!");
74+
print("INFO: BuyDoorHandler loaded!");
7175

7276
end
7377

7478
function BuyDoorHandler:OnSave(saveLoadHandler)
7579

76-
print("saving buy door")
80+
print("INFO: BuyDoorHandler saving...");
7781
saveLoadHandler:SaveTableAsString("buyDoorHandlerBuyDoorTable", self.buyDoorTable);
82+
print("INFO: BuyDoorHandler saved!");
7883

7984
end
8085

@@ -120,11 +125,11 @@ function BuyDoorHandler:ChangeCooldownTime(index, newTime)
120125
if self.buyDoorTable[index] then
121126
self.buyDoorTable[index]:SendMessage("BuyDoor_ChangeCooldownTime", newTime);
122127
else
123-
print("Buy Door Handler was asked to change the cooldown time of an index that didn't exist!");
128+
print("ERROR: BuyDoorHandler was asked to change the cooldown time of an index that didn't exist!");
124129
return false;
125130
end
126131
else
127-
print("Buy Door Handler was asked to change a cooldown time, but was not given an index or a new time!");
132+
print("ERROR: BuyDoorHandler was asked to change a cooldown time, but was not given an index or a new time!");
128133
return false;
129134
end
130135

@@ -134,7 +139,6 @@ end
134139
function BuyDoorHandler:SendCustomOrder(order, team, specificIndex)
135140

136141
if specificIndex then
137-
--print("specificattempted")
138142
if (not self.buyDoorTable[specificIndex]:NumberValueExists("BuyDoor_Unusable")) and self.buyDoorTable[specificIndex]:IsInventoryEmpty() then
139143
for k, item in pairs(order) do
140144
self.buyDoorTable[specificIndex]:AddInventoryItem(item);

Data/Base.rte/Activities/Utility/DeliveryCreationHandler.lua

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,9 +243,8 @@ end
243243

244244
function DeliveryCreationHandler:OnLoad(saveLoadHandler)
245245

246-
print("loading deliverycreationhandler...");
246+
print("INFO: DeliveryCreationHandler loading...");
247247
self.saveTable = saveLoadHandler:ReadSavedStringAsTable("deliveryCreationHandlerSaveTable");
248-
print("loaded deliverycreationhandler!");
249248

250249
-- re-add virtual teams
251250

@@ -267,12 +266,15 @@ function DeliveryCreationHandler:OnLoad(saveLoadHandler)
267266
end
268267
end
269268

269+
print("INFO: DeliveryCreationHandler loaded!");
270+
270271
end
271272

272273
function DeliveryCreationHandler:OnSave(saveLoadHandler)
273274

274-
print("saving deliverycreationhandler")
275+
print("INFO: DeliveryCreationHandler saving...");
275276
saveLoadHandler:SaveTableAsString("deliveryCreationHandlerSaveTable", self.saveTable);
277+
print("INFO: DeliveryCreationHandler saved!");
276278

277279
end
278280

Data/Base.rte/Activities/Utility/DockingHandler.lua

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,6 @@ end
5757

5858
function DockingHandler:Initialize(activity, newGame, autoAssignUnknownDropships, verboseLogging)
5959

60-
print("dockhandler inited")
61-
print(SceneMan.SceneOrbitDirection)
62-
6360
if verboseLogging then
6461
self.verboseLogging = true;
6562
end
@@ -155,21 +152,23 @@ function DockingHandler:Initialize(activity, newGame, autoAssignUnknownDropships
155152
end
156153
end
157154

155+
print("INFO: DockingHandler initialized!");
156+
158157
end
159158

160159
function DockingHandler:OnLoad(saveLoadHandler)
161160

162-
print("loading dockinghandler...");
161+
print("INFO: DockingHandler loading...");
163162
self.mainTable = saveLoadHandler:ReadSavedStringAsTable("dockingHandlerMainTable");
164-
print("loaded dockinghandler!");
163+
print("INFO: DockingHandler loaded!");
165164

166165
end
167166

168167
function DockingHandler:OnSave(saveLoadHandler)
169168

170-
print("saved docking maintable!")
171-
print(self.mainTable)
169+
print("INFO: DockingHandler saving...");
172170
saveLoadHandler:SaveTableAsString("dockingHandlerMainTable", self.mainTable);
171+
print("INFO: DockingHandler saved!");
173172

174173
end
175174

@@ -329,8 +328,6 @@ function DockingHandler:UpdateUndersideDockingCraft()
329328
for i, dockTable in ipairs(self.mainTable.activeDSDockTable) do
330329
if not dockTable.activeCraft and not self.mainTable.activeRocketDockTable[i].activeCraft then
331330

332-
print("found dock for unknown craft")
333-
334331
craft.AIMode = Actor.AIMODE_GOTO;
335332
--craft.Team = 0
336333
--craft.Pos = Vector(dockTable.dockPosition.X, SceneMan.Scene.Height - 100);

Data/Base.rte/Activities/Utility/HUDHandler.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ function HUDHandler:UpdateHUDHandler()
380380
-- not ideal: anyone pressing any key can skip the panning event... but the alternatives are much more roundabout
381381
if self.teamCameraTimers[team]:IsPastSimMS(cameraTable.holdTime) or (not cameraTable.notCancellable and UInputMan:AnyKeyPress()) then
382382
-- Callback functions
383-
if cameraTable.callback then
383+
if cameraTable.callback and type(cameraTable.callback) == "function" then
384384
cameraTable.callback();
385385
end
386386

0 commit comments

Comments
 (0)