[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Enigma-cvs] enigma/src oxyd.cc,1.68.2.1,1.68.2.2
From: |
Daniel Heck <address@hidden> |
Subject: |
[Enigma-cvs] enigma/src oxyd.cc,1.68.2.1,1.68.2.2 |
Date: |
Mon, 06 Oct 2003 19:30:51 +0000 |
Update of /cvsroot/enigma/enigma/src
In directory subversions:/tmp/cvs-serv1770/src
Modified Files:
Tag: enigma0_80_rc
oxyd.cc
Log Message:
Assign half of the meditation marbles to player 2 in 2p mode
Index: oxyd.cc
===================================================================
RCS file: /cvsroot/enigma/enigma/src/oxyd.cc,v
retrieving revision 1.68.2.1
retrieving revision 1.68.2.2
diff -C2 -d -r1.68.2.1 -r1.68.2.2
*** oxyd.cc 23 Sep 2003 22:46:20 -0000 1.68.2.1
--- oxyd.cc 6 Oct 2003 19:30:49 -0000 1.68.2.2
***************
*** 488,493 ****
using namespace world;
! int nmarbles = level.getNumMarbles();
for (int i=0; i<nmarbles; ++i) {
const Marble &marble = level.getMarble(i);
--- 488,494 ----
using namespace world;
! int nmeditationmarbles = 0;
+ int nmarbles = level.getNumMarbles();
for (int i=0; i<nmarbles; ++i) {
const Marble &marble = level.getMarble(i);
***************
*** 509,515 ****
case MarbleType_Meditation:
ac = MakeActor ("ac-whiteball-small");
! ac->set_attrib ("player", Value(0.0));
- ac->set_attrib("mouseforce", Value(1.0));
// if (minfo.is_default(MI_FORCE)) {
// ac->set_attrib("mouseforce", Value(1.0));
--- 510,519 ----
case MarbleType_Meditation:
ac = MakeActor ("ac-whiteball-small");
! nmeditationmarbles += 1;
! if (needs_twoplayers() && (nmeditationmarbles % 2)==0)
! ac->set_attrib("player", Value(1.0));
! else
! ac->set_attrib ("player", Value(0.0));
// if (minfo.is_default(MI_FORCE)) {
// ac->set_attrib("mouseforce", Value(1.0));
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Enigma-cvs] enigma/src oxyd.cc,1.68.2.1,1.68.2.2,
Daniel Heck <address@hidden> <=