[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus/src/ui botpanel.c mouse.c
From: |
address@hidden |
Subject: |
[Stratagus-CVS] stratagus/src/ui botpanel.c mouse.c |
Date: |
30 Jan 2004 12:47:49 +1100 |
CVSROOT: /home/strat
Module name: stratagus
Changes by: <address@hidden> 04/01/30 12:47:49
Modified files:
src/ui : botpanel.c mouse.c
Log message:
Basic Protection against sending commands for others
Patches:
Index: stratagus/src/ui/botpanel.c
diff -u stratagus/src/ui/botpanel.c:1.104 stratagus/src/ui/botpanel.c:1.105
--- stratagus/src/ui/botpanel.c:1.104 Fri Jan 23 05:12:27 2004
+++ stratagus/src/ui/botpanel.c Fri Jan 30 12:47:48 2004
@@ -27,7 +27,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: botpanel.c,v 1.104 2004/01/22 18:12:27 nobody_ Exp $
+// $Id: botpanel.c,v 1.105 2004/01/30 01:47:48 wizzard Exp $
//@{
@@ -104,7 +104,7 @@
char* cp;
CLprintf(file, "\n;;; -----------------------------------------\n");
- CLprintf(file, ";;; MODULE: buttons $Id: botpanel.c,v 1.104 2004/01/22
18:12:27 nobody_ Exp $\n\n");
+ CLprintf(file, ";;; MODULE: buttons $Id: botpanel.c,v 1.105 2004/01/30
01:47:48 wizzard Exp $\n\n");
for (i = 0; i < NumUnitButtons; ++i) {
CLprintf(file, "(define-button 'pos %d 'level %d 'icon '%s\n",
@@ -852,8 +852,10 @@
}
//
// Button not available.
+ // or Not Teamed
//
- if (CurrentButtons[button].Pos == -1) {
+ if (CurrentButtons[button].Pos == -1 ||
+ !PlayersTeamed(ThisPlayer->Player,
Selected[0]->Player->Player)) {
return;
}
Index: stratagus/src/ui/mouse.c
diff -u stratagus/src/ui/mouse.c:1.173 stratagus/src/ui/mouse.c:1.174
--- stratagus/src/ui/mouse.c:1.173 Mon Jan 19 09:36:30 2004
+++ stratagus/src/ui/mouse.c Fri Jan 30 12:47:48 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: mouse.c,v 1.173 2004/01/18 22:36:30 nobody_ Exp $
+// $Id: mouse.c,v 1.174 2004/01/30 01:47:48 wizzard Exp $
//@{
@@ -1574,7 +1574,8 @@
// clicked on training button
//
} else if (ButtonAreaUnderCursor == ButtonAreaTraining)
{
- if (!GameObserve && !GamePaused) {
+ if (!GameObserve && !GamePaused &&
+ PlayersTeamed(ThisPlayer->Player,
Selected[0]->Player->Player)) {
if (ButtonUnderCursor <
Selected[0]->Data.Train.Count) {
DebugLevel0Fn("Cancel slot %d
%s\n" _C_
ButtonUnderCursor _C_
@@ -1588,7 +1589,8 @@
// clicked on upgrading button
//
} else if (ButtonAreaUnderCursor ==
ButtonAreaUpgrading) {
- if (!GameObserve && !GamePaused) {
+ if (!GameObserve && !GamePaused &&
+ PlayersTeamed(ThisPlayer->Player,
Selected[0]->Player->Player)) {
if (ButtonUnderCursor == 0 &&
NumSelected == 1) {
DebugLevel0Fn("Cancel upgrade
%s\n" _C_
Selected[0]->Type->Ident);
@@ -1599,7 +1601,8 @@
// clicked on researching button
//
} else if (ButtonAreaUnderCursor ==
ButtonAreaResearching) {
- if (!GameObserve && !GamePaused) {
+ if (!GameObserve && !GamePaused &&
+ PlayersTeamed(ThisPlayer->Player,
Selected[0]->Player->Player)) {
if (ButtonUnderCursor == 0 &&
NumSelected == 1) {
DebugLevel0Fn("Cancel research
%s\n" _C_
Selected[0]->Type->Ident);
@@ -1613,7 +1616,8 @@
//
// for transporter
//
- if (!GameObserve && !GamePaused) {
+ if (!GameObserve && !GamePaused &&
+ PlayersTeamed(ThisPlayer->Player,
Selected[0]->Player->Player)) {
if (Selected[0]->InsideCount >=
ButtonUnderCursor) {
// FIXME: should check if valid
here.
// n0b0dy: check WHAT?
@@ -1627,7 +1631,8 @@
}
}
} else if (ButtonAreaUnderCursor == ButtonAreaButton) {
- if (!GameObserve && !GamePaused) {
+ if (!GameObserve && !GamePaused &&
+ PlayersTeamed(ThisPlayer->Player,
Selected[0]->Player->Player)) {
DoButtonButtonClicked(ButtonUnderCursor);
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Stratagus-CVS] stratagus/src/ui botpanel.c mouse.c,
address@hidden <=