Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix RuntimeException while restoring a saved game #11

Closed
wants to merge 6 commits into from
Closed

Fix RuntimeException while restoring a saved game #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c26933b
RuntimeException while restoring savegames when cartridge has task ev…
allyourcodearebelongtous Apr 10, 2020
80adc39
RuntimeException while restoring savegames when cartridge has task ev…
allyourcodearebelongtous Apr 10, 2020
44a1895
Merge remote-tracking branch 'origin/master'
allyourcodearebelongtous Apr 10, 2020
9de4575
RuntimeException while restoring savegames when cartridge has task ev…
allyourcodearebelongtous Apr 10, 2020
6fcd0c4
RuntimeException while restoring savegames when cartridge has task ev…
allyourcodearebelongtous Apr 11, 2020
ade1b40
Merge branch 'cgeo:master' into master
allyourcodearebelongtous Mar 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
318 changes: 166 additions & 152 deletions OpenWIGLibrary/src/cz/matejcik/openwig/EventTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,152 +1,166 @@
package cz.matejcik.openwig;

import se.krka.kahlua.stdlib.BaseLib;
import se.krka.kahlua.vm.*;

import java.io.*;

public class EventTable implements LuaTable, Serializable {

public LuaTable table = new LuaTableImpl();

private LuaTable metatable = new LuaTableImpl();

private static class TostringJavaFunc implements JavaFunction {

public EventTable parent;

public TostringJavaFunc (EventTable parent) {
this.parent = parent;
}

public int call (LuaCallFrame callFrame, int nArguments) {
callFrame.push(parent.luaTostring());
return 1;
}
};

protected String luaTostring () { return "a ZObject instance"; }

public EventTable() {
metatable.rawset("__tostring", new TostringJavaFunc(this));
}

public void serialize (DataOutputStream out) throws IOException {
Engine.instance.savegame.storeValue(table, out);
}

public void deserialize (DataInputStream in) throws IOException {
Engine.instance.savegame.restoreValue(in, this);
//setTable(table);
}

public String name, description;
public ZonePoint position = null;
protected boolean visible = false;

public Media media, icon;

public byte[] getMedia () throws IOException {
return Engine.mediaFile(media);
}

public byte[] getIcon () throws IOException {
return Engine.mediaFile(icon);
}

public boolean isVisible() { return visible; }

public void setPosition(ZonePoint location) {
position = location;
table.rawset("ObjectLocation", location);
}

public boolean isLocated() {
return position != null;
}

protected void setItem(String key, Object value) {
if ("Name".equals(key)) {
name = BaseLib.rawTostring(value);
} else if ("Description".equals(key)) {
description = Engine.removeHtml(BaseLib.rawTostring(value));
} else if ("Visible".equals(key)) {
visible = LuaState.boolEval(value);
} else if ("ObjectLocation".equals(key)) {
//setPosition(ZonePoint.copy((ZonePoint)value));
// i know there was need to copy. but why? it is messing up deserialization
position = (ZonePoint)value;
} else if ("Media".equals(key)) {
media = (Media)value;
} else if ("Icon".equals(key)) {
icon = (Media)value;
}
}

protected Object getItem (String key) {
if ("CurrentDistance".equals(key)) {
if (isLocated()) return LuaState.toDouble(position.distance(Engine.instance.player.position));
else return LuaState.toDouble(-1);
} else if ("CurrentBearing".equals(key)) {
if (isLocated())
return LuaState.toDouble(ZonePoint.angle2azimuth(position.bearing(Engine.instance.player.position)));
else return LuaState.toDouble(0);
} else return table.rawget(key);
}

public void setTable (LuaTable table) {
Object n = null;
while ((n = table.next(n)) != null) {
Object val = table.rawget(n);
rawset(n, val);
//if (n instanceof String) setItem((String)n, val);
}
}

public void callEvent(String name, Object param) {
try {
Object o = table.rawget(name);
if (o instanceof LuaClosure) {
Engine.log("EVNT: " + toString() + "." + name + (param!=null ? " (" + param.toString() + ")" : ""), Engine.LOG_CALL);
LuaClosure event = (LuaClosure) o;
Engine.state.call(event, this, param, null);
Engine.log("EEND: " + toString() + "." + name, Engine.LOG_CALL);
}
} catch (Throwable t) {
Engine.stacktrace(t);
}
}

public boolean hasEvent(String name) {
return (table.rawget(name)) instanceof LuaClosure;
}

public String toString() {
return (name == null ? "(unnamed)" : name);
}

public void rawset(Object key, Object value) {
// TODO unify rawset/setItem
if (key instanceof String) {
setItem((String) key, value);
}
table.rawset(key, value);
Engine.log("PROP: " + toString() + "." + key + " is set to " + (value == null ? "nil" : value.toString()), Engine.LOG_PROP);
}

public void setMetatable (LuaTable metatable) { }

public LuaTable getMetatable () { return metatable; }

public Object rawget (Object key) {
// TODO unify rawget/getItem
if (key instanceof String)
return getItem((String)key);
else
return table.rawget(key);
}

public Object next (Object key) { return table.next(key); }

public int len () { return table.len(); }
}
package cz.matejcik.openwig;

import se.krka.kahlua.stdlib.BaseLib;
import se.krka.kahlua.vm.*;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Codacy Issue found: Avoid unused imports such as 'se.krka.kahlua.vm'


import java.io.*;

public class EventTable implements LuaTable, Serializable {

public LuaTable table = new LuaTableImpl();

private LuaTable metatable = new LuaTableImpl();

private boolean isDeserializing = false;

private static class TostringJavaFunc implements JavaFunction {

public EventTable parent;

public TostringJavaFunc (EventTable parent) {
this.parent = parent;
}

public int call (LuaCallFrame callFrame, int nArguments) {
callFrame.push(parent.luaTostring());
return 1;
}
};

protected String luaTostring () { return "a ZObject instance"; }

public EventTable() {
metatable.rawset("__tostring", new TostringJavaFunc(this));
}

public void serialize (DataOutputStream out) throws IOException {
Engine.instance.savegame.storeValue(table, out);
}

public void deserialize (DataInputStream in) throws IOException {
isDeserializing = true;
Engine.instance.savegame.restoreValue(in, this);
isDeserializing = false;
//setTable(table);
}

public String name, description;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Codacy Issue found: Fields should be declared at the top of the class, before any method declarations, constructors, initializers or inner classes.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Codacy Issue found: Use one line for each declaration, it enhances code readability.

public ZonePoint position = null;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Codacy Issue found: Fields should be declared at the top of the class, before any method declarations, constructors, initializers or inner classes.

protected boolean visible = false;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Codacy Issue found: Fields should be declared at the top of the class, before any method declarations, constructors, initializers or inner classes.


public Media media, icon;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Codacy Issue found: Fields should be declared at the top of the class, before any method declarations, constructors, initializers or inner classes.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Codacy Issue found: Use one line for each declaration, it enhances code readability.


public byte[] getMedia () throws IOException {
return Engine.mediaFile(media);
}

public byte[] getIcon () throws IOException {
return Engine.mediaFile(icon);
}

public boolean isVisible() { return visible; }

public void setPosition(ZonePoint location) {
position = location;
table.rawset("ObjectLocation", location);
}

public boolean isLocated() {
return position != null;
}

protected void setItem(String key, Object value) {
if ("Name".equals(key)) {
name = BaseLib.rawTostring(value);
} else if ("Description".equals(key)) {
description = Engine.removeHtml(BaseLib.rawTostring(value));
} else if ("Visible".equals(key)) {
visible = LuaState.boolEval(value);
} else if ("ObjectLocation".equals(key)) {
//setPosition(ZonePoint.copy((ZonePoint)value));
// i know there was need to copy. but why? it is messing up deserialization
position = (ZonePoint)value;
} else if ("Media".equals(key)) {
media = (Media)value;
} else if ("Icon".equals(key)) {
icon = (Media)value;
}
}

protected Object getItem (String key) {
if ("CurrentDistance".equals(key)) {
if (isLocated()) return LuaState.toDouble(position.distance(Engine.instance.player.position));
else return LuaState.toDouble(-1);
} else if ("CurrentBearing".equals(key)) {
if (isLocated())
return LuaState.toDouble(ZonePoint.angle2azimuth(position.bearing(Engine.instance.player.position)));
else return LuaState.toDouble(0);
} else return table.rawget(key);
}

public void setTable (LuaTable table) {
Object n = null;
while ((n = table.next(n)) != null) {
Object val = table.rawget(n);
rawset(n, val);
//if (n instanceof String) setItem((String)n, val);
}
}

public void callEvent(String name, Object param) {
/*
workaround: suppress RuntimeException when callEvent() is called at deserialiation
@see https://github.com/cgeo/openWIG/issues/8#issuecomment-612182631
TODO actually fix EventTable and ALL of its subclasses as described in the link
*/
if (isDeserializing) {
return;
}
/* end workaround */
try {
Object o = table.rawget(name);
if (o instanceof LuaClosure) {
Engine.log("EVNT: " + toString() + "." + name + (param!=null ? " (" + param.toString() + ")" : ""), Engine.LOG_CALL);
LuaClosure event = (LuaClosure) o;
Engine.state.call(event, this, param, null);
Engine.log("EEND: " + toString() + "." + name, Engine.LOG_CALL);
}
} catch (Throwable t) {
Engine.stacktrace(t);
}
}

public boolean hasEvent(String name) {
return (table.rawget(name)) instanceof LuaClosure;
}

public String toString() {
return (name == null ? "(unnamed)" : name);
}


public void rawset(Object key, Object value) {
// TODO unify rawset/setItem
if (key instanceof String) {
setItem((String) key, value);
}
table.rawset(key, value);
Engine.log("PROP: " + toString() + "." + key + " is set to " + (value == null ? "nil" : value.toString()), Engine.LOG_PROP);
}

public void setMetatable (LuaTable metatable) { }
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Codacy Issue found: Document empty method body


public LuaTable getMetatable () { return metatable; }

public Object rawget (Object key) {
// TODO unify rawget/getItem
if (key instanceof String)
return getItem((String)key);
else
return table.rawget(key);
}

public Object next (Object key) { return table.next(key); }

public int len () { return table.len(); }
}
Loading