~mdw
/
sgt
/
puzzles
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix formatting.
[sgt/puzzles]
/
PuzzleApplet.java
diff --git
a/PuzzleApplet.java
b/PuzzleApplet.java
index
f68dddf
..
b796aa4
100644
(file)
--- a/
PuzzleApplet.java
+++ b/
PuzzleApplet.java
@@
-179,7
+179,6
@@
public class PuzzleApplet extends JApplet implements Runtime.CallJavaCB {
} catch (java.lang.NullPointerException ex) {
gameid = null;
}
} catch (java.lang.NullPointerException ex) {
gameid = null;
}
- System.out.println("ooh " + gameid);
if (gameid == null) {
puzzle_args = null;
} else {
if (gameid == null) {
puzzle_args = null;
} else {
@@
-374,7
+373,7
@@
public class PuzzleApplet extends JApplet implements Runtime.CallJavaCB {
case 7: // string
gg.setColor(colors[arg2]);
{
case 7: // string
gg.setColor(colors[arg2]);
{
- String text = runtime.
c
string(arg3);
+ String text = runtime.
utf
string(arg3);
Font ft = new Font((xarg3 & 0x10) != 0 ? "Monospaced" : "Dialog",
Font.PLAIN, 100);
int height100 = this.getFontMetrics(ft).getHeight();
Font ft = new Font((xarg3 & 0x10) != 0 ? "Monospaced" : "Dialog",
Font.PLAIN, 100);
int height100 = this.getFontMetrics(ft).getHeight();
@@
-383,8
+382,6
@@
public class PuzzleApplet extends JApplet implements Runtime.CallJavaCB {
int asc = fm.getAscent(), desc = fm.getDescent();
if ((xarg3 & ALIGN_VCENTRE) != 0)
xarg2 += asc - (asc+desc)/2;
int asc = fm.getAscent(), desc = fm.getDescent();
if ((xarg3 & ALIGN_VCENTRE) != 0)
xarg2 += asc - (asc+desc)/2;
- else
- xarg2 += asc;
int wid = fm.stringWidth(text);
if ((xarg3 & ALIGN_HCENTRE) != 0)
xarg1 -= wid / 2;
int wid = fm.stringWidth(text);
if ((xarg3 & ALIGN_HCENTRE) != 0)
xarg1 -= wid / 2;
@@
-605,7
+602,7
@@
public class PuzzleApplet extends JApplet implements Runtime.CallJavaCB {
break;
case C_CHOICES:
JComboBox jcm = (JComboBox)cc.component;
break;
case C_CHOICES:
JComboBox jcm = (JComboBox)cc.component;
- runtimeCall("jcallback_config_set_
boolean
", new int[] {cc.configItemPointer, jcm.getSelectedIndex()});
+ runtimeCall("jcallback_config_set_
choice
", new int[] {cc.configItemPointer, jcm.getSelectedIndex()});
break;
}
}
break;
}
}