OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- moved armor class declarations to their own file and added necessary #includes only to those files actually using them.

Browse source 
- added copyright headers to a_armor.cpp and a_keys.cpp.
This commit is contained in:
Christoph Oelckers 2016-11-30 10:55:03 +01:00
commit 78fa076079
16 changed files with 233 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

64
src/g_inventory/a_keys.cpp
View file

@ -1,3 +1,36 @@
/*
** a_keys.cpp
** Implements all keys and associated data
**
**---------------------------------------------------------------------------
** Copyright 2005-2016 Cheistoph Oelckers
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions
** are met:
**
** 1. Redistributions of source code must retain the above copyright
** notice, this list of conditions and the following disclaimer.
** 2. Redistributions in binary form must reproduce the above copyright
** notice, this list of conditions and the following disclaimer in the
** documentation and/or other materials provided with the distribution.
** 3. The name of the author may not be used to endorse or promote products
** derived from this software without specific prior written permission.
**
** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
** OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
** IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
** INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
** NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
**---------------------------------------------------------------------------
**
*/
#include "a_keys.h"
#include "tarray.h"
#include "gi.h"
@ -12,6 +45,18 @@
#include "v_font.h"
//===========================================================================
//
// Data for the LOCKDEFS
//
//===========================================================================
//===========================================================================
//
//
//===========================================================================
struct OneKey
{
PClassActor *key;
@ -45,6 +90,11 @@ struct OneKey
}
};
//===========================================================================
//
//
//===========================================================================
struct Keygroup
{
TArray<OneKey> anykeylist;
@ -59,6 +109,11 @@ struct Keygroup
}
};
//===========================================================================
//
//
//===========================================================================
struct Lock
{
TArray<Keygroup *> keylist;
@ -100,6 +155,10 @@ struct Lock
}
};
//===========================================================================
//
//
//===========================================================================
static Lock *locks[256]; // all valid locks
static bool keysdone=false; // have the locks been initialized?
@ -490,6 +549,11 @@ bool AKey::HandlePickup (AInventory *item)
return false;
}
//===========================================================================
//
//
//===========================================================================
bool AKey::ShouldStay ()
{
return !!multiplayer;