Message

Reply | Reply all

Date Prev | Date Next | Thread Prev | Thread Next Date Index | Thread Index

From: cvs at opencores.org<cvs@o...>
Date: Wed May 21 23:45:39 CEST 2008
Subject: [cvs-checkins] MODIFIED: jop ...
Date: 00/08/05 21:23:45

Modified: jop/java/target/src/app/oebb Logic.java Main.java
Log:
BG V 2.06


Revision Changes Path
1.24 jop/java/target/src/app/oebb/Logic.java

http://www.opencores.org/cvsweb.shtml/jop/java/target/src/app/oebb/Logic.java.diff?r1=1.23&r2=1.24

(In the diff below, changes in quantity of whitespace are not shown.)

Index: Logic.java
===================================================================
RCS file: /cvsroot/martin/jop/java/target/src/app/oebb/Logic.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- Logic.java 19 May 2008 19:42:02 -0000 1.23
+++ Logic.java 21 May 2008 21:45:38 -0000 1.24
@@ -1715,24 +1715,29 @@
int i = 0;

System.out.println("HB Ferl");
- int melnr = Flash.getFirst(Main.state.strnr);
+// int melnr = Flash.getFirst(Main.state.strnr);
+ int melnr = Main.state.getPos();
Flash.Point p = Flash.getPoint(melnr);
-
- for (;;) {
- i = Flash.getNext(melnr);
- i = Flash.getNext(i);
- if (i!=-1) {
- melnr = i;
- if (melnr>=Main.state.getPos()) {
- p = Flash.getPoint(melnr);
- break;
- }
- } else {
- i = 0;
- break;
- }
+ if (p==null) {
+System.out.println("np Problem");
+ return;
}

+// for (;;) {
+// i = Flash.getNext(melnr);
+// i = Flash.getNext(i);
+// if (i!=-1) {
+// melnr = i;
+// if (melnr>=Main.state.getPos()) {
+// p = Flash.getPoint(melnr);
+// break;
+// }
+// } else {
+// i = 0;
+// break;
+// }
+// }
+
while (loop()) {

// check for going back to 'Bereit'
@@ -1751,28 +1756,38 @@
return;
}

- // display only the left point text
+ boolean found = false;

if (val==Keyboard.UP) {
+ while (!found) {
i = Flash.getNext(melnr);
- i = Flash.getNext(i);
if (i!=-1) {
melnr = i;
p = Flash.getPoint(melnr);
+ if (p.station || p.verlassen) {
+ found = true;
+ }
+ } else {
+ break;
+ }
}
}
if (val==Keyboard.DOWN) {
+ while (!found) {
i = Flash.getPrev(melnr);
- i = Flash.getPrev(i);
if (i!=-1) {
melnr = i;
p = Flash.getPoint(melnr);
+ if (p.station || p.verlassen) {
+ found = true;
+ }
+ } else {
+ break;
+ }
} } if (val==Keyboard.E) { - // The left point is the station - // smaller melnr is start Main.state.start = Main.state.getPos(); Main.state.end = melnr; Logic.state = Logic.ERLAUBNIS; 1.29 jop/java/target/src/app/oebb/Main.java http://www.opencores.org/cvsweb.shtml/jop/java/target/src/app/oebb/Main.java.diff?r1=1.28&r2=1.29 (In the diff below, changes in quantity of whitespace are not shown.) Index: Main.java =================================================================== RCS file: /cvsroot/martin/jop/java/target/src/app/oebb/Main.java,v retrieving revision 1.28 retrieving revision 1.29 diff -u -b -r1.28 -r1.29 --- Main.java 19 May 2008 19:42:02 -0000 1.28 +++ Main.java 21 May 2008 21:45:38 -0000 1.29 @@ -62,7 +62,7 @@ // SW version public static final int VER_MAJ = 2; - public static final int VER_MIN = 5; + public static final int VER_MIN = 6; private static final int STRECKE_PRIO = 1; private static final int STRECKE_PERIOD = 100000;