Skip to content

Commit 8ee3329

Browse files
committed
Fixed save slot bug
1 parent 22452bb commit 8ee3329

File tree

3 files changed

+32
-2
lines changed

3 files changed

+32
-2
lines changed

objects/oLoad.object.gmx

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,28 @@
88
<parentName>&lt;undefined&gt;</parentName>
99
<maskName>&lt;undefined&gt;</maskName>
1010
<events>
11+
<event eventtype="2" enumb="1">
12+
<action>
13+
<libid>1</libid>
14+
<id>603</id>
15+
<kind>7</kind>
16+
<userelative>0</userelative>
17+
<isquestion>0</isquestion>
18+
<useapplyto>-1</useapplyto>
19+
<exetype>2</exetype>
20+
<functionname></functionname>
21+
<codestring></codestring>
22+
<whoName>self</whoName>
23+
<relative>0</relative>
24+
<isnot>0</isnot>
25+
<arguments>
26+
<argument>
27+
<kind>1</kind>
28+
<string></string>
29+
</argument>
30+
</arguments>
31+
</action>
32+
</event>
1133
<event eventtype="2" enumb="0">
1234
<action>
1335
<libid>1</libid>
@@ -49,7 +71,6 @@
4971
<kind>1</kind>
5072
<string>if(instance_exists(oServer)){
5173
with(oServer) event_user(2);
52-
alarm[0] = 120;
5374
}
5475
</string>
5576
</argument>
@@ -79,6 +100,12 @@ if(alarm[0] &gt; 0){
79100
draw_text(x - 12, y + 12, "Loaded slot " + string(global.slot) + "!");
80101
draw_set_halign(fa_left);
81102
}
103+
104+
if(alarm[1] &gt; 0){
105+
draw_set_halign(fa_right);
106+
draw_text(x - 12, y + 12, "Save " + string(global.slot) + " doesn't exist!");
107+
draw_set_halign(fa_left);
108+
}
82109
</string>
83110
</argument>
84111
</arguments>

objects/oServer.object.gmx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1711,6 +1711,9 @@ switch(type_event){
17111711
ds_list_destroy(list);
17121712
alarm[2] = 30;
17131713
alarm[5] = 30;
1714+
oLoad.alarm[0] = 120;
1715+
} else {
1716+
oLoad.alarm[1] = 120;
17141717
}
17151718

17161719
</string>

objects/oSlot.object.gmx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<arguments>
4949
<argument>
5050
<kind>1</kind>
51-
<string>if(oLoad.alarm[0] &lt; 0 &amp;&amp; oSave.alarm[0] &lt; 0){
51+
<string>if(oLoad.alarm[0] &lt; 0 &amp;&amp; oSave.alarm[0] &lt; 0 &amp;&amp; oLoad.alarm[1] &lt; 0){
5252
global.slot++;
5353

5454
if(global.slot &gt; 3){

0 commit comments

Comments
 (0)