~ubuntu-branches/ubuntu/oneiric/blobandconquer/oneiric

« back to all changes in this revision

Viewing changes to src/hud/options.cpp

Committer: Bazaar Package Importer
Author(s): Guus Sliepen
Date: 2008-06-15 12:04:29 UTC
mfrom: (1.1.1 upstream)
Revision ID: james.westby@ubuntu.com-20080615120429-5ss7cbb4z9mpywj5

Tags: 0.95-1

http://bugs.debian.org/486310

New upstream release. Closes: #486310

files added:
gfx/primitive/altSwitch.primitive

src/camera.cpp

src/camera.h

src/cplusplus

src/cplusplus/CAudio.cpp

src/cplusplus/CAudio.h

src/cplusplus/CBSP.cpp

src/cplusplus/CBSP.h

src/cplusplus/CBaseWidget.cpp

src/cplusplus/CBaseWidget.h

src/cplusplus/CBlobDef.cpp

src/cplusplus/CBlobDef.h

src/cplusplus/CBoss.cpp

src/cplusplus/CBoss.h

src/cplusplus/CBossDef.cpp

src/cplusplus/CBossDef.h

src/cplusplus/CBoundingBox.cpp

src/cplusplus/CBoundingBox.h

src/cplusplus/CBoundingBoxManager.cpp

src/cplusplus/CBoundingBoxManager.h

src/cplusplus/CBullet.cpp

src/cplusplus/CBullet.h

src/cplusplus/CButton.cpp

src/cplusplus/CButton.h

src/cplusplus/CCamera.cpp

src/cplusplus/CCamera.h

src/cplusplus/CCheckBox.cpp

src/cplusplus/CCheckBox.h

src/cplusplus/CCollision.cpp

src/cplusplus/CCollision.h

src/cplusplus/CComboBox.cpp

src/cplusplus/CComboBox.h

src/cplusplus/CCrumb.cpp

src/cplusplus/CCrumb.h

src/cplusplus/CCrumbBox.cpp

src/cplusplus/CCrumbBox.h

src/cplusplus/CCutsceneCamera.cpp

src/cplusplus/CCutsceneCamera.h

src/cplusplus/CCutsceneCommand.cpp

src/cplusplus/CCutsceneCommand.h

src/cplusplus/CData.cpp

src/cplusplus/CData.h

src/cplusplus/CDecal.cpp

src/cplusplus/CDecal.h

src/cplusplus/CDecoration.cpp

src/cplusplus/CDecoration.h

src/cplusplus/CDoor.cpp

src/cplusplus/CDoor.h

src/cplusplus/CEmitter.cpp

src/cplusplus/CEmitter.h

src/cplusplus/CEnemyDef.cpp

src/cplusplus/CEnemyDef.h

src/cplusplus/CEngine.cpp

src/cplusplus/CEngine.h

src/cplusplus/CEntity.cpp

src/cplusplus/CEntity.h

src/cplusplus/CEntityDef.cpp

src/cplusplus/CEntityDef.h

src/cplusplus/CEntityManager.cpp

src/cplusplus/CEntityManager.h

src/cplusplus/CFace.cpp

src/cplusplus/CFace.h

src/cplusplus/CFeature.cpp

src/cplusplus/CFeature.h

src/cplusplus/CFeatureDef.cpp

src/cplusplus/CFeatureDef.h

src/cplusplus/CFileData.cpp

src/cplusplus/CFileData.h

src/cplusplus/CFrustum.cpp

src/cplusplus/CFrustum.h

src/cplusplus/CGLColor.cpp

src/cplusplus/CGLColor.h

src/cplusplus/CGame.cpp

src/cplusplus/CGame.h

src/cplusplus/CGeometry.cpp

src/cplusplus/CGeometry.h

src/cplusplus/CGraphics.cpp

src/cplusplus/CGraphics.h

src/cplusplus/CGrid.cpp

src/cplusplus/CGrid.h

src/cplusplus/CHashtable.cpp

src/cplusplus/CHashtable.h

src/cplusplus/CInputWidget.cpp

src/cplusplus/CInputWidget.h

src/cplusplus/CItem.cpp

src/cplusplus/CItem.h

src/cplusplus/CItemDef.cpp

src/cplusplus/CItemDef.h

src/cplusplus/CLabel.cpp

src/cplusplus/CLabel.h

src/cplusplus/CLinkable.cpp

src/cplusplus/CLinkable.h

src/cplusplus/CList.cpp

src/cplusplus/CList.h

src/cplusplus/CListView.cpp

src/cplusplus/CListView.h

src/cplusplus/CListViewItem.cpp

src/cplusplus/CListViewItem.h

src/cplusplus/CMD2.cpp

src/cplusplus/CMD2.h

src/cplusplus/CMDLModel.cpp

src/cplusplus/CMDLModel.h

src/cplusplus/CMap.cpp

src/cplusplus/CMap.h

src/cplusplus/CMath.cpp

src/cplusplus/CMath.h

src/cplusplus/CMission.cpp

src/cplusplus/CMission.h

src/cplusplus/CModelManager.cpp

src/cplusplus/CModelManager.h

src/cplusplus/CMouse.cpp

src/cplusplus/CMouse.h

src/cplusplus/CObjective.cpp

src/cplusplus/CObjective.h

src/cplusplus/CPak.cpp

src/cplusplus/CPak.h

src/cplusplus/CPanel.cpp

src/cplusplus/CPanel.h

src/cplusplus/CParticle.cpp

src/cplusplus/CParticle.h

src/cplusplus/CParticleManager.cpp

src/cplusplus/CParticleManager.h

src/cplusplus/CPlane.cpp

src/cplusplus/CPlane.h

src/cplusplus/CPoint.cpp

src/cplusplus/CPoint.h

src/cplusplus/CProperties.cpp

src/cplusplus/CProperties.h

src/cplusplus/CQ3Target.cpp

src/cplusplus/CQ3Target.h

src/cplusplus/CRandomNameGen.cpp

src/cplusplus/CRandomNameGen.h

src/cplusplus/CReference.cpp

src/cplusplus/CReference.h

src/cplusplus/CSaveGameHeader.cpp

src/cplusplus/CSaveGameHeader.h

src/cplusplus/CSimpleModel.cpp

src/cplusplus/CSimpleModel.h

src/cplusplus/CSlider.cpp

src/cplusplus/CSlider.h

src/cplusplus/CSprite.cpp

src/cplusplus/CSprite.h

src/cplusplus/CString.cpp

src/cplusplus/CString.h

src/cplusplus/CStructure.cpp

src/cplusplus/CStructure.h

src/cplusplus/CSwitch.cpp

src/cplusplus/CSwitch.h

src/cplusplus/CTexture.cpp

src/cplusplus/CTexture.h

src/cplusplus/CTextureManager.cpp

src/cplusplus/CTextureManager.h

src/cplusplus/CTextureSpec.cpp

src/cplusplus/CTextureSpec.h

src/cplusplus/CTextureSpecManager.cpp

src/cplusplus/CTextureSpecManager.h

src/cplusplus/CTrace.cpp

src/cplusplus/CTrace.h

src/cplusplus/CTrap.cpp

src/cplusplus/CTrap.h

src/cplusplus/CTriangle.cpp

src/cplusplus/CTriangle.h

src/cplusplus/CTrigger.cpp

src/cplusplus/CTrigger.h

src/cplusplus/CUIManager.cpp

src/cplusplus/CUIManager.h

src/cplusplus/CUnit.cpp

src/cplusplus/CUnit.h

src/cplusplus/CVector.cpp

src/cplusplus/CVector.h

src/cplusplus/CVectori.cpp

src/cplusplus/CVectori.h

src/cplusplus/CWeapon.cpp

src/cplusplus/CWeapon.h

src/cplusplus/CWeaponDef.cpp

src/cplusplus/CWeaponDef.h

src/misc

src/misc/cutscene.cpp

src/misc/cutscene.h

src/misc/md2.cpp

src/misc/md2.h

src/misc/misc.cpp

src/misc/misc.h

src/misc/opengl.cpp

src/misc/opengl.h

textures/game/altSwitch1.png

textures/game/altSwitch2.png

files removed:
src/3d

src/3d/CBSP.cpp

src/3d/CBSP.h

src/3d/CBoundingBox.cpp

src/3d/CBoundingBox.h

src/3d/CBoundingBoxManager.cpp

src/3d/CBoundingBoxManager.h

src/3d/CFace.cpp

src/3d/CFace.h

src/3d/CFrustum.cpp

src/3d/CFrustum.h

src/3d/CMD2.cpp

src/3d/CMD2.h

src/3d/CMDLModel.cpp

src/3d/CMDLModel.h

src/3d/CPlane.cpp

src/3d/CPlane.h

src/3d/CPoint.cpp

src/3d/CPoint.h

src/3d/CSimpleModel.cpp

src/3d/CSimpleModel.h

src/3d/CTrace.cpp

src/3d/CTrace.h

src/3d/CTriangle.cpp

src/3d/CTriangle.h

src/3d/CVector.cpp

src/3d/CVector.h

src/3d/CVectori.cpp

src/3d/CVectori.h

src/common

src/common/CLinkable.cpp

src/common/CLinkable.h

src/common/CReference.cpp

src/common/CReference.h

src/common/CString.cpp

src/common/CString.h

src/cutscene.cpp

src/cutscene.h

src/game

src/game/CBlobDef.cpp

src/game/CBlobDef.h

src/game/CBoss.cpp

src/game/CBoss.h

src/game/CBossDef.cpp

src/game/CBossDef.h

src/game/CBullet.cpp

src/game/CBullet.h

src/game/CCrumb.cpp

src/game/CCrumb.h

src/game/CCrumbBox.cpp

src/game/CCrumbBox.h

src/game/CCutsceneCamera.cpp

src/game/CCutsceneCamera.h

src/game/CCutsceneCommand.cpp

src/game/CCutsceneCommand.h

src/game/CDecal.cpp

src/game/CDecal.h

src/game/CDecoration.cpp

src/game/CDecoration.h

src/game/CDoor.cpp

src/game/CDoor.h

src/game/CEmitter.cpp

src/game/CEmitter.h

src/game/CEnemyDef.cpp

src/game/CEnemyDef.h

src/game/CEntity.cpp

src/game/CEntity.h

src/game/CEntityDef.cpp

src/game/CEntityDef.h

src/game/CEntityManager.cpp

src/game/CEntityManager.h

src/game/CFeature.cpp

src/game/CFeature.h

src/game/CFeatureDef.cpp

src/game/CFeatureDef.h

src/game/CGame.cpp

src/game/CGame.h

src/game/CItem.cpp

src/game/CItem.h

src/game/CItemDef.cpp

src/game/CItemDef.h

src/game/CMap.cpp

src/game/CMap.h

src/game/CMission.cpp

src/game/CMission.h

src/game/CObjective.cpp

src/game/CObjective.h

src/game/CParticle.cpp

src/game/CParticle.h

src/game/CQ3Target.cpp

src/game/CQ3Target.h

src/game/CRandomNameGen.cpp

src/game/CRandomNameGen.h

src/game/CSaveGameHeader.cpp

src/game/CSaveGameHeader.h

src/game/CStructure.cpp

src/game/CStructure.h

src/game/CSwitch.cpp

src/game/CSwitch.h

src/game/CTrap.cpp

src/game/CTrap.h

src/game/CTrigger.cpp

src/game/CTrigger.h

src/game/CUnit.cpp

src/game/CUnit.h

src/game/CWeapon.cpp

src/game/CWeapon.h

src/game/CWeaponDef.cpp

src/game/CWeaponDef.h

src/gui

src/gui/CBaseWidget.cpp

src/gui/CBaseWidget.h

src/gui/CButton.cpp

src/gui/CButton.h

src/gui/CCheckBox.cpp

src/gui/CCheckBox.h

src/gui/CComboBox.cpp

src/gui/CComboBox.h

src/gui/CGrid.cpp

src/gui/CGrid.h

src/gui/CInputWidget.cpp

src/gui/CInputWidget.h

src/gui/CLabel.cpp

src/gui/CLabel.h

src/gui/CListView.cpp

src/gui/CListView.h

src/gui/CListViewItem.cpp

src/gui/CListViewItem.h

src/gui/CPanel.cpp

src/gui/CPanel.h

src/gui/CSlider.cpp

src/gui/CSlider.h

src/md2.cpp

src/md2.h

src/misc.cpp

src/misc.h

src/opengl.cpp

src/opengl.h

src/system

src/system/CAudio.cpp

src/system/CAudio.h

src/system/CCamera.cpp

src/system/CCamera.h

src/system/CCollision.cpp

src/system/CCollision.h

src/system/CEngine.cpp

src/system/CEngine.h

src/system/CFileData.cpp

src/system/CFileData.h

src/system/CGLColor.cpp

src/system/CGLColor.h

src/system/CGeometry.cpp

src/system/CGeometry.h

src/system/CGraphics.cpp

src/system/CGraphics.h

src/system/CMath.cpp

src/system/CMath.h

src/system/CModelManager.cpp

src/system/CModelManager.h

src/system/CMouse.cpp

src/system/CMouse.h

src/system/CPak.cpp

src/system/CPak.h

src/system/CParticleManager.cpp

src/system/CParticleManager.h

src/system/CSprite.cpp

src/system/CSprite.h

src/system/CTexture.cpp

src/system/CTexture.h

src/system/CTextureManager.cpp

src/system/CTextureManager.h

src/system/CTextureSpec.cpp

src/system/CTextureSpec.h

src/system/CTextureSpecManager.cpp

src/system/CTextureSpecManager.h

src/system/CUIManager.cpp

src/system/CUIManager.h

src/util

src/util/CData.cpp

src/util/CData.h

src/util/CHashtable.cpp

src/util/CHashtable.h

src/util/CList.cpp

src/util/CList.h

src/util/CProperties.cpp

src/util/CProperties.h

files modified:
data/bsp/ancientTomb2.bsp

data/bsp/ancientTomb2.map

data/bsp/bioMechTower1.bsp

data/bsp/bioMechTower1.map

data/bsp/bossBattle2.bsp

data/bsp/bossBattle2.map

data/bsp/caves1.bsp

data/bsp/caves1.map

data/bsp/enemyBase1_1.bsp

data/bsp/enemyBase1_1.map

data/bsp/enemyBase1_2.bsp

data/bsp/enemyBase1_2.map

data/bsp/enemyBase1_3.bsp

data/bsp/enemyBase1_3.map

data/bsp/floodedTunnel.bsp

data/bsp/floodedTunnel.map

data/bsp/grasslands2.bsp

data/bsp/grasslands2.map

data/bsp/hub.bsp

data/bsp/hub.map

data/bsp/sewers1.bsp

data/bsp/sewers1.map

data/bsp/start.bsp

data/bsp/start.map

data/combatResources/models

data/combatResources/textures

data/cutscenes/scripts/bossBattle2Start

data/gameDefs/defines.h

data/misc/en/mastermind

data/missions/hub

debian/changelog

debian/control

makefile

src/battle.cpp

src/battle.h

src/bosses/finalBoss.cpp

src/defs.h

src/effects/decals.cpp

src/effects/decoration.cpp

src/effects/emitters.cpp

src/effects/emitters.h

src/effects/shadows.cpp

src/entities/blobs.cpp

src/entities/bosses.cpp

src/entities/bullets.cpp

src/entities/doors.cpp

src/entities/doors.h

src/entities/enemy.cpp

src/entities/features.cpp

src/entities/features.h

src/entities/items.cpp

src/entities/structures.cpp

src/entities/structures.h

src/entities/switches.cpp

src/entities/switches.h

src/entities/units.cpp

src/headers.h

src/hud/dialogs.cpp

src/hud/options.cpp

src/hud/status.cpp

src/io/load.cpp

src/player.cpp

src/puzzles/mastermind.cpp

src/world/bsp.cpp

src/world/world.cpp

src/world/world.h

Show diffs side-by-side

added added

removed removed

src/hud/options.cpp

328

329

graphics->setMode(MODE_3D);

330

331

game->changeCameraRotation(0);

332

331

333

drawGameObjects();

332

334

333

335

graphics->setMode(MODE_2D);

478

480

479

481

graphics->setMode(MODE_3D);

480

482

483

game->changeCameraRotation(0);

484

481

485

drawGameObjects();

482

486

483

487

graphics->setMode(MODE_2D);

537

541

538

542

graphics->setMode(MODE_3D);

539

543

544

game->changeCameraRotation(0);

545

540

546

drawGameObjects();

541

547

542

548

graphics->setMode(MODE_2D);

633

639

634

640

graphics->setMode(MODE_3D);

635

641

642

game->changeCameraRotation(0);

643

636

644

drawGameObjects();

637

645

638

646

graphics->setMode(MODE_2D);

792

800

graphics->clearScreen();

793

801

794

802

graphics->setMode(MODE_3D);

803

804

game->changeCameraRotation(0);

795

805

796

806

drawGameObjects();

797

807

Older »