~swag/armagetronad/0.2.9-sty+ct+ap-fork

« back to all changes in this revision

Viewing changes to src/engine/eVoter.cpp

Committer: kyle
Date: 2011-07-20 17:52:45 UTC
mfrom: (563.20.34 0.2.8-armagetronad-sty)
Revision ID: racingmasterweb@gmail.com-20110720175245-8coqtsgb86qbfjwv

merge with mainline

files modified:
NEWS

batch/make/uninstall

config/settings.cfg

configure.ac

language/english_base.txt

src/engine/eCoord.h

src/engine/eGameObject.h

src/engine/ePlayer.cpp

src/engine/ePlayer.h

src/engine/eTeam.cpp

src/engine/eVoter.cpp

src/network/nKrawallPrivate.cpp

src/network/nNetObject.h

src/network/nNetwork.cpp

src/network/nNetwork.h

src/network/nPriorizing.cpp

src/network/nPriorizing.h

src/network/nServerInfo.h

src/render/rModel.h

src/tools/tArray.h

src/tools/tConfiguration.h

src/tools/tDirectories.cpp

src/tools/tDirectories.h

src/tools/tHeap.h

src/tools/tLinkedList.h

src/tools/tList.h

src/tools/tLocale.h

src/tools/tMemManager.cpp

src/tools/tResourceManager.cpp

src/tools/tSafePTR.h

src/tools/tToDo.cpp

src/tron/gArmagetron.cpp

src/tron/gCycle.cpp

src/tron/gGame.cpp

src/tron/gMenus.cpp

src/tron/gServerBrowser.cpp

src/tron/gServerFavorites.cpp

src/tron/gSpawn.h

src/tron/gWall.cpp

src/ui/uInput.cpp

src/ui/uMenu.h

Show diffs side-by-side

added added

removed removed

src/engine/eVoter.cpp

219

eVoteItem( void ): creationTime_( tSysTimeFloat() ), user_( 0 ), id_( ++se_votingItemID ), menuItem_( 0 ), total_( 0 )

220

{

221

items_.Add( this );

222

};

222

}

223

224

virtual ~eVoteItem( void );

225

313

con << tOutput( "$vote_new", GetDescription() );

314

315

this->Evaluate();

316

};

316

}

317

318

nMessage* CreateMessage( void ) const

319

{

685

}

686

687

return true;

688

};

688

}

689

690

virtual bool DoCheckValid( int senderID ){ return true; }

691

696

// write our message ID

697

m.Write( id_ );

698

}

699

};

699

}

700

701

protected:

702

virtual tString DoGetDetails() const // returns the detailed description of the voting item

717

virtual void DoFillToMessageLegacy( nMessage& m ) const

718

{

719

return DoFillToMessage( m );

720

};

720

}

721

722

virtual nDescriptor& DoGetDescriptor() const = 0; // returns the creation descriptor

723

virtual tString DoGetDescription() const = 0; // returns the description of the voting item

967

m >> description_;

968

m >> details_;

969

return eVoteItem::DoFillFromMessage( m );

970

};

970

}

971

972

virtual void DoFillToMessage( nMessage& m ) const

973

{

974

m << description_;

975

m << details_;

976

eVoteItem::DoFillToMessage( m );

977

};

977

}

978

979

virtual void DoExecute(){}; // called when the voting was successful

979

virtual void DoExecute(){} // called when the voting was successful

980

protected:

981

virtual nDescriptor& DoGetDescriptor() const; // returns the creation descriptor

982

1144

virtual void DoFillToMessageLegacy( nMessage& m ) const

1145

{

1146

return eVoteItemHarm::DoFillToMessage( m );

1147

};

1147

}

1148

1149

virtual bool DoFillFromMessage( nMessage& m )

1150

{

1216

}

1217

1218

return eVoteItem::DoCheckValid( senderID );

1219

};

1219

}

1220

1221

virtual void DoFillToMessage( nMessage& m ) const

1222

{

1226

m.Write( 0 );

1227

1228

eVoteItem::DoFillToMessage( m );

1229

};

1229

}

1230

1231

protected:

1232

virtual nDescriptor& DoGetDescriptor() const; // returns the creation descriptor

1325

}

1326

1327

return eVoteItemHarm::DoCheckValid( senderID );

1328

};

1328

}

1329

1330

virtual void DoExecute() // called when the voting was successful

1331

{

1383

Update();

1384

1385

return ret;

1386

};

1386

}

1387

1388

virtual void DoFillToMessage( nMessage& m ) const

1389

{

1391

tASSERT( sn_GetNetState() != nCLIENT );

1392

1393

eVoteItemServerControlled::DoFillToMessage( m );

1394

};

1394

}

1395

private:

1396

virtual void Update() //!< update description and details

1397

{

1498

1499

// no transformation needed or transformation failed. Proceed as usual.

1500

return eVoteItemHarm::DoCheckValid( senderID );

1501

};

1501

}

1502

1503

virtual void DoExecute() // called when the voting was successful

1504

{

Older »