OSDN -- Develop and Download Open Source Software
  • R/O
  • SSH
  • HTTPS

oricsdk: Commit


Commit MetaInfo

Revision817 (tree)
Time2012-03-01 02:09:50
Authorbarnsey123

Log Message

v.009 - Fixed introduced bugs regarding capturing the king. Changed the timer animations.

Change Summary

Incremental Difference

--- users/barnsey123/HNEFATAFL/main.c (revision 816)
+++ users/barnsey123/HNEFATAFL/main.c (revision 817)
@@ -266,7 +266,7 @@
266266 //gameinput=0; // 0=undefined 1=play against computer, 2=human vs human
267267 CopyFont(); //memcpy((unsigned char*)0xb400+32*8,Font_6x8_runic1_full,768);
268268 hires();
269- message="*** V 0.008\n*** BY BARNSEY123\n*** ALSO: DBUG:CHEMA:JAMESD:XERON";
269+ message="*** V 0.009\n*** BY BARNSEY123\n*** ALSO: DBUG:CHEMA:JAMESD:XERON";
270270 printmessage();
271271 setflags(0); // No keyclick, no cursor, no nothing
272272 printtitles();
@@ -400,10 +400,6 @@
400400 }
401401 if (a == kingns) // if candidate is on same row as king (don't move away if only one piece E/W)
402402 {
403-<<<<<<< .mine
404- //printf("%d:",kingpieces[EAST]);
405-=======
406->>>>>>> .r812
407403 if ((b > kingew)&&(kingpieces[EAST]==1)) {zerofoundpiece();}
408404 if ((b < kingew)&&(kingpieces[WEST]==1)) {zerofoundpiece();}
409405 }
@@ -1160,7 +1156,7 @@
11601156 void movepiece()
11611157 {
11621158 p1=1; // piece type comparison (lower) - used for determining takes - default=attacker
1163- p2=1; // piece type comparison (upper) - used for determining takes - default=attacker
1159+ p2=4; // piece type comparison (upper) - used for determining takes - default=attacker
11641160 piecetype=players[ons][oew]; // obtain type of piece
11651161 // move piece
11661162 fb=0;
@@ -1341,6 +1337,9 @@
13411337 if (( players[pcheckns2][pcheckew2] == p1 )||(players[pcheckns2][pcheckew2] == p2 )||(players[pcheckns2][pcheckew2] == 4)) //
13421338 {
13431339 take++;
1340+ //if ((players[pcheckns1][pcheckew1]==3)&&(surrounded<3))take--; // if possible take is a king but not surrounded
1341+ if (players[pcheckns1][pcheckew1]==3)take--; // if possible take is a king
1342+
13441343 }
13451344 if ( computer[pcheckns2][pcheckew2] ) {inctarget();} // 31-10-2011 - can possibly take on next turn
13461345 }
@@ -1417,7 +1416,7 @@
14171416 for (timer=0;timer<8;timer++)
14181417 {
14191418 tileloop();
1420- pausetime=300;pause();
1419+ pausetime=250;pause();
14211420 }
14221421 }
14231422
--- users/barnsey123/HNEFATAFL/osdk_makedata.bat (revision 816)
+++ users/barnsey123/HNEFATAFL/osdk_makedata.bat (revision 817)
@@ -5,5 +5,5 @@
55 %OSDK%\bin\pictconv -m0 -f0 -o4_BorderTiles pics\bordertiles.png border.s
66 %OSDK%\bin\pictconv -m0 -f0 -o4_TitleTiles pics\defence-force2.png defence.s
77 %OSDK%\bin\pictconv -m0 -f0 -o4_RunicTiles pics\runes.png runes.s
8-%OSDK%\bin\pictconv -m0 -f0 -o4_TimerTiles pics\timer.png timer.s
8+%OSDK%\bin\pictconv -m0 -f0 -o4_TimerTiles pics\timer5.png timer.s
99 pause
--- users/barnsey123/HNEFATAFL/timer.s (revision 816)
+++ users/barnsey123/HNEFATAFL/timer.s (revision 817)
@@ -1,29 +1,29 @@
11 _TimerTiles
2- .byt $7f,$7f,$7f,$60,$40,$40,$6c,$7b,$66,$69,$47,$72,$61,$47,$70,$67
3- .byt $47,$7c,$68,$67,$62,$68,$57,$42,$68,$4e,$42,$67,$7b,$7c,$68,$4e
4- .byt $42,$68,$55,$42,$68,$64,$62,$67,$44,$5c,$61,$44,$50,$69,$44,$52
5- .byt $6c,$7b,$66,$60,$40,$40,$7f,$7f,$7f,$60,$40,$40,$6c,$7b,$66,$69
6- .byt $44,$52,$61,$44,$50,$67,$44,$5c,$68,$64,$7e,$68,$55,$7e,$68,$4f
7- .byt $7e,$67,$7b,$7c,$68,$4e,$42,$68,$55,$42,$68,$64,$62,$67,$44,$5c
8- .byt $61,$44,$50,$69,$44,$52,$6c,$7b,$66,$60,$40,$40,$7f,$7f,$7f,$60
9- .byt $40,$40,$6c,$7b,$66,$69,$44,$52,$61,$44,$50,$67,$44,$5c,$68,$64
10- .byt $62,$68,$55,$42,$68,$4e,$42,$67,$7b,$7c,$68,$4f,$7e,$68,$55,$7e
11- .byt $68,$64,$7e,$67,$44,$5c,$61,$44,$50,$69,$44,$52,$6c,$7b,$66,$60
12- .byt $40,$40,$7f,$7f,$7f,$60,$40,$40,$6c,$7b,$66,$69,$44,$52,$61,$44
13- .byt $50,$67,$44,$5c,$68,$64,$62,$68,$55,$42,$68,$4e,$42,$67,$7b,$7c
14- .byt $68,$4e,$42,$68,$57,$42,$68,$67,$62,$67,$47,$7c,$61,$47,$70,$69
15- .byt $47,$72,$6c,$7b,$66,$60,$40,$40,$7f,$7f,$7f,$60,$40,$40,$6c,$7b
16- .byt $66,$69,$44,$52,$61,$44,$50,$67,$44,$5c,$68,$64,$62,$68,$55,$42
17- .byt $68,$4e,$42,$67,$7b,$7c,$68,$4e,$42,$68,$5d,$42,$68,$7c,$62,$67
18- .byt $7c,$5c,$61,$7c,$50,$69,$7c,$52,$6c,$7b,$66,$60,$40,$40,$7f,$7f
19- .byt $7f,$60,$40,$40,$6c,$7b,$66,$69,$44,$52,$61,$44,$50,$67,$44,$5c
20- .byt $68,$64,$62,$68,$55,$42,$68,$4e,$42,$67,$7b,$7c,$6f,$7e,$42,$6f
21- .byt $75,$42,$6f,$64,$62,$67,$44,$5c,$61,$44,$50,$69,$44,$52,$6c,$7b
22- .byt $66,$60,$40,$40,$7f,$7f,$7f,$60,$40,$40,$6c,$7b,$66,$69,$44,$52
23- .byt $61,$44,$50,$67,$44,$5c,$6f,$64,$62,$6f,$75,$42,$6f,$7e,$42,$67
24- .byt $7b,$7c,$68,$4e,$42,$68,$55,$42,$68,$64,$62,$67,$44,$5c,$61,$44
25- .byt $50,$69,$44,$52,$6c,$7b,$66,$60,$40,$40,$7f,$7f,$7f,$60,$40,$40
26- .byt $6c,$7b,$66,$69,$7c,$52,$61,$7c,$50,$67,$7c,$5c,$68,$7c,$62,$68
27- .byt $5d,$42,$68,$4e,$42,$67,$7b,$7c,$68,$4e,$42,$68,$55,$42,$68,$64
28- .byt $62,$67,$44,$5c,$61,$44,$50,$69,$44,$52,$6c,$7b,$66,$60,$40,$40
2+ .byt $7f,$7f,$7f,$60,$40,$40,$6d,$77,$7e,$6c,$67,$7c,$62,$57,$78,$69
3+ .byt $47,$72,$6c,$67,$66,$6a,$57,$4a,$6a,$56,$52,$68,$64,$62,$69,$4b
4+ .byt $4a,$6a,$59,$4a,$6c,$64,$66,$69,$42,$52,$62,$59,$48,$6c,$60,$66
5+ .byt $6d,$7f,$76,$60,$40,$40,$7f,$7f,$7f,$60,$40,$40,$6d,$7f,$72,$6c
6+ .byt $60,$66,$62,$53,$4e,$69,$48,$5e,$6c,$64,$7e,$6a,$51,$7e,$6a,$5b
7+ .byt $7e,$68,$67,$7e,$69,$48,$40,$6a,$59,$4a,$6c,$64,$66,$69,$42,$52
8+ .byt $62,$59,$48,$6c,$60,$66,$6d,$7f,$76,$60,$40,$40,$7f,$7f,$7f,$60
9+ .byt $40,$40,$6d,$7f,$76,$6c,$60,$66,$62,$53,$48,$69,$48,$52,$6c,$64
10+ .byt $66,$6a,$53,$4a,$6a,$58,$40,$68,$67,$7e,$69,$4b,$7e,$6a,$59,$7e
11+ .byt $6c,$64,$7e,$69,$42,$5e,$62,$59,$4e,$6c,$60,$66,$6d,$7f,$72,$60
12+ .byt $40,$40,$7f,$7f,$7f,$60,$40,$40,$6d,$7f,$76,$6c,$60,$66,$62,$53
13+ .byt $48,$69,$48,$52,$6c,$64,$66,$6a,$53,$4a,$6a,$5a,$52,$68,$64,$62
14+ .byt $69,$46,$4a,$6a,$57,$4a,$6c,$67,$66,$69,$47,$72,$62,$57,$78,$6c
15+ .byt $67,$7c,$6d,$77,$7e,$60,$40,$40,$7f,$7f,$7f,$60,$40,$40,$6d,$7f
16+ .byt $76,$6c,$60,$66,$62,$53,$48,$69,$48,$52,$6c,$64,$66,$6a,$53,$4a
17+ .byt $6a,$5a,$52,$68,$64,$62,$69,$4d,$4a,$6a,$5d,$4a,$6c,$7c,$66,$69
18+ .byt $7c,$52,$63,$7d,$48,$67,$7c,$66,$6f,$7d,$76,$60,$40,$40,$7f,$7f
19+ .byt $7f,$60,$40,$40,$6d,$7f,$76,$6c,$60,$66,$62,$53,$48,$69,$48,$52
20+ .byt $6c,$64,$66,$6a,$53,$4a,$60,$42,$52,$6f,$7c,$62,$6f,$7b,$4a,$6f
21+ .byt $71,$4a,$6f,$64,$66,$6f,$42,$52,$6e,$59,$48,$6c,$60,$66,$69,$7f
22+ .byt $76,$60,$40,$40,$7f,$7f,$7f,$60,$40,$40,$69,$7f,$76,$6c,$60,$66
23+ .byt $6e,$53,$48,$6f,$48,$52,$6f,$64,$66,$6f,$73,$4a,$6f,$7a,$52,$6f
24+ .byt $7c,$62,$60,$43,$4a,$6a,$59,$4a,$6c,$64,$66,$69,$42,$52,$62,$59
25+ .byt $48,$6c,$60,$66,$6d,$7f,$76,$60,$40,$40,$7f,$7f,$7f,$60,$40,$40
26+ .byt $6f,$7d,$76,$67,$7c,$66,$63,$7d,$48,$69,$7c,$52,$6c,$7c,$66,$6a
27+ .byt $5d,$4a,$6a,$4c,$52,$68,$64,$62,$69,$4b,$4a,$6a,$59,$4a,$6c,$64
28+ .byt $66,$69,$42,$52,$62,$59,$48,$6c,$60,$66,$6d,$7f,$76,$60,$40,$40
2929
Show on old repository browser