[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus doc/ChangeLog.html src/ui/mainscr.c s...
|
From: |
Russell Smith |
|
Subject: |
[Stratagus-CVS] stratagus doc/ChangeLog.html src/ui/mainscr.c s... |
|
Date: |
Thu, 13 Nov 2003 15:15:57 -0500 |
CVSROOT: /cvsroot/stratagus
Module name: stratagus
Branch:
Changes by: Russell Smith <address@hidden> 03/11/13 15:15:57
Modified files:
doc : ChangeLog.html
src/ui : mainscr.c
src/clone : selection.c
Log message:
Fixed Bug #6516: Cactus selection problem in Magnant
Patches:
Index: stratagus/doc/ChangeLog.html
diff -u stratagus/doc/ChangeLog.html:1.573 stratagus/doc/ChangeLog.html:1.574
--- stratagus/doc/ChangeLog.html:1.573 Mon Nov 10 22:06:50 2003
+++ stratagus/doc/ChangeLog.html Thu Nov 13 15:15:53 2003
@@ -2,7 +2,7 @@
<html>
<head>
<!--
----- $Id: ChangeLog.html,v 1.573 2003/11/11 03:06:50 n0body Exp $
+---- $Id: ChangeLog.html,v 1.574 2003/11/13 20:15:53 mr-russ Exp $
---- (c) Copyright 1998-2003 by Lutz Sammer
@@ -36,6 +36,7 @@
<li>Future 2.00 Release<p>
<ul>
<li>++
+ <li>Fixed Bug #6516: Cactus selection problem in Magnant (from Russell
Smith).
<li>Fixed Bug #6427 and added a brand new seen mechanism (from Crestez
Leonard).
<li>Fixed Bug #6391: Infinite loop in UpdateMinimap() (from Russell Smith).
<li>Major clean-up in checking goals that disappear and unit reference
counting (from Crestez Leonard).
Index: stratagus/src/clone/selection.c
diff -u stratagus/src/clone/selection.c:1.59
stratagus/src/clone/selection.c:1.60
--- stratagus/src/clone/selection.c:1.59 Wed Nov 12 15:40:24 2003
+++ stratagus/src/clone/selection.c Thu Nov 13 15:15:56 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: selection.c,v 1.59 2003/11/12 20:40:24 jsalmon3 Exp $
+// $Id: selection.c,v 1.60 2003/11/13 20:15:56 mr-russ Exp $
//@{
@@ -168,7 +168,7 @@
return 0;
}
- if (!unit->Type->Selectable) {
+ if (!unit->Type->Selectable && GameRunning) {
return 0;
}
@@ -288,7 +288,7 @@
HandleSuicideClick(base);
}
- if (!base->Type->Selectable) {
+ if (!base->Type->Selectable && GameRunning) {
return 0;
}
@@ -978,7 +978,7 @@
char* ref;
CLprintf(file, "\n;;; -----------------------------------------\n");
- CLprintf(file, ";;; MODULE: selection $Id: selection.c,v 1.59 2003/11/12
20:40:24 jsalmon3 Exp $\n\n");
+ CLprintf(file, ";;; MODULE: selection $Id: selection.c,v 1.60 2003/11/13
20:15:56 mr-russ Exp $\n\n");
CLprintf(file, "(set-group-id! %d)\n", GroupId);
CLprintf(file, "(selection %d '(", NumSelected);
Index: stratagus/src/ui/mainscr.c
diff -u stratagus/src/ui/mainscr.c:1.141 stratagus/src/ui/mainscr.c:1.142
--- stratagus/src/ui/mainscr.c:1.141 Wed Nov 12 18:18:11 2003
+++ stratagus/src/ui/mainscr.c Thu Nov 13 15:15:55 2003
@@ -27,7 +27,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: mainscr.c,v 1.141 2003/11/12 23:18:11 jsalmon3 Exp $
+// $Id: mainscr.c,v 1.142 2003/11/13 20:15:55 mr-russ Exp $
//@{
@@ -1183,9 +1183,10 @@
// Nothing selected
DrawInfoPanelBackground(0);
- if (UnitUnderCursor && UnitVisibleOnMap(UnitUnderCursor)) {
- // FIXME: not correct for enemies units
- DrawUnitInfo(UnitUnderCursor);
+ if (UnitUnderCursor && UnitVisibleOnMap(UnitUnderCursor) &&
+ (UnitUnderCursor->Type->Selectable || !GameRunning)) {
+ // FIXME: not correct for enemies units
+ DrawUnitInfo(UnitUnderCursor);
} else {
int x;
int y;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Stratagus-CVS] stratagus doc/ChangeLog.html src/ui/mainscr.c s...,
Russell Smith <=