[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus data/ccl/units.ccl src/clone/mainloop...
From: |
Martin Renold |
Subject: |
[Stratagus-CVS] stratagus data/ccl/units.ccl src/clone/mainloop... |
Date: |
Sat, 08 Nov 2003 05:23:04 -0500 |
CVSROOT: /cvsroot/stratagus
Module name: stratagus
Branch:
Changes by: Martin Renold <address@hidden> 03/11/08 05:23:04
Modified files:
data/ccl : units.ccl
src/clone : mainloop.c
src/include : video.h
src/unit : ccl_unittype.c
Log message:
quit on inconsistent unittype (bos medic)
Patches:
Index: stratagus/data/ccl/units.ccl
diff -u stratagus/data/ccl/units.ccl:1.51 stratagus/data/ccl/units.ccl:1.52
--- stratagus/data/ccl/units.ccl:1.51 Mon Oct 27 00:20:12 2003
+++ stratagus/data/ccl/units.ccl Sat Nov 8 05:23:03 2003
@@ -26,7 +26,7 @@
;; along with this program; if not, write to the Free Software
;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA
;;
-;; $Id: units.ccl,v 1.51 2003/10/27 05:20:12 mr-russ Exp $
+;; $Id: units.ccl,v 1.52 2003/11/08 10:23:03 martinxyz Exp $
;; Load the animations for the units.
(ccl:load "ccl/anim.ccl")
@@ -64,7 +64,6 @@
'max-attack-range 1
'priority 40
'type-naval
- 'right-attack
'sea-unit
'selectable-by-rectangle
'sounds '())
@@ -83,7 +82,6 @@
'max-attack-range 1
'priority 40
'type-naval
- 'right-attack
'sea-unit
'selectable-by-rectangle
'sounds '())
Index: stratagus/src/clone/mainloop.c
diff -u stratagus/src/clone/mainloop.c:1.156
stratagus/src/clone/mainloop.c:1.157
--- stratagus/src/clone/mainloop.c:1.156 Fri Nov 7 15:02:06 2003
+++ stratagus/src/clone/mainloop.c Sat Nov 8 05:23:03 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: mainloop.c,v 1.156 2003/11/07 20:02:06 n0body Exp $
+// $Id: mainloop.c,v 1.157 2003/11/08 10:23:03 martinxyz Exp $
//@{
@@ -912,7 +912,7 @@
}
if (MustRedraw /* && !VideoInterrupts */ &&
(FastForwardCycle <= GameCycle || GameCycle <= 10 ||
- !(GameCycle & 0x3f))) {
+ GameCycle % 64 == 0)) {
if (Callbacks == &MenuCallbacks) {
MustRedraw |= RedrawMenu;
}
@@ -945,7 +945,7 @@
if (FastForwardCycle == GameCycle) {
VideoSyncSpeed = RealVideoSyncSpeed;
}
- if (FastForwardCycle <= GameCycle || !(GameCycle & 0x3f)) {
+ if (FastForwardCycle <= GameCycle || GameCycle % 64 == 0) {
WaitEventsOneFrame(Callbacks);
}
if (!NetworkInSync) {
Index: stratagus/src/include/video.h
diff -u stratagus/src/include/video.h:1.94 stratagus/src/include/video.h:1.95
--- stratagus/src/include/video.h:1.94 Fri Nov 7 15:02:08 2003
+++ stratagus/src/include/video.h Sat Nov 8 05:23:04 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: video.h,v 1.94 2003/11/07 20:02:08 n0body Exp $
+// $Id: video.h,v 1.95 2003/11/08 10:23:04 martinxyz Exp $
#ifndef __VIDEO_H__
#define __VIDEO_H__
@@ -381,7 +381,7 @@
/**
- ** Video synchronization speed. Synchronization time in prozent.
+ ** Video synchronization speed. Synchronization time in percent.
** If =0, video framerate is not synchronized. 100 is exact
** CYCLES_PER_SECOND (30). Game will try to redraw screen within
** intervals of VideoSyncSpeed, not more, not less.
Index: stratagus/src/unit/ccl_unittype.c
diff -u stratagus/src/unit/ccl_unittype.c:1.108
stratagus/src/unit/ccl_unittype.c:1.109
--- stratagus/src/unit/ccl_unittype.c:1.108 Mon Nov 3 06:21:43 2003
+++ stratagus/src/unit/ccl_unittype.c Sat Nov 8 05:23:04 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: ccl_unittype.c,v 1.108 2003/11/03 11:21:43 pludov Exp $
+// $Id: ccl_unittype.c,v 1.109 2003/11/08 10:23:04 martinxyz Exp $
//@{
@@ -666,6 +666,13 @@
errl("Unsupported tag", value);
DebugCheck(1);
}
+ }
+
+ // FIXME: try to simplify/combine the flags instead
+ if (type->MouseAction == MouseActionAttack && !type->CanAttack) {
+ printf("Unit-type `%s': right-attack is set, but can-attack is not\n",
type->Name);
+ // ugly way to show the line number
+ errl("", SCM_UNSPECIFIED);
}
return SCM_UNSPECIFIED;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Stratagus-CVS] stratagus data/ccl/units.ccl src/clone/mainloop...,
Martin Renold <=