← Back to branch summary

~ubuntu-branches/ubuntu/natty/spring/natty

« back to all changes in this revision

Viewing changes to rts/Lua/LuaFeatureDefs.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Scott Ritchie
  • Date: 2010-09-23 18:56:03 UTC
  • mfrom: (3.1.9 experimental)
  • Revision ID: james.westby@ubuntu.com-20100923185603-st97s5chplo42y7w
Tags: 0.82.5.1+dfsg1-1ubuntu1
https://launchpad.net/bugs/612905
* Latest upstream version for online play
* debian/control: Replace (rather than conflict) spring-engine
  - spring-engine will be a dummy package (LP: #612905)
  - also set maintainer to MOTU

Show diffs side-by-side

added added

removed removed

Lines of Context:
rts/Lua/LuaFeatureDefs.cpp
 
1
/* This file is part of the Spring engine (GPL v2 or later), see LICENSE.html */
 
2
 
1
3
#include "StdAfx.h"
2
 
// LuaFeatureDefs.cpp: implementation of the LuaFeatureDefs class.
3
 
//
4
 
//////////////////////////////////////////////////////////////////////
 
4
#include "mmgr.h"
5
5
 
6
6
#include <set>
7
7
#include <string>
10
10
#include <map>
11
11
#include <cctype>
12
12
 
13
 
#include "mmgr.h"
14
 
 
15
13
#include "LuaFeatureDefs.h"
16
14
 
17
15
#include "LuaInclude.h"
20
18
#include "LuaDefs.h"
21
19
#include "LuaHandle.h"
22
20
#include "LuaUtils.h"
 
21
#include "Rendering/Models/3DModel.h"
23
22
#include "Sim/Features/Feature.h"
24
23
#include "Sim/Features/FeatureHandler.h"
25
 
#include "LogOutput.h"
26
 
#include "FileSystem/FileHandler.h"
27
 
#include "FileSystem/FileSystem.h"
 
24
#include "System/LogOutput.h"
 
25
#include "System/FileSystem/FileHandler.h"
 
26
#include "System/FileSystem/FileSystem.h"
28
27
 
29
28
using namespace std;
30
29
 
275
274
 
276
275
static int FeatureDefMetatable(lua_State* L)
277
276
{
278
 
        const void* userData = lua_touserdata(L, lua_upvalueindex(1));
 
277
        /*const void* userData =*/ lua_touserdata(L, lua_upvalueindex(1));
279
278
        //const FeatureDef* fd = (const FeatureDef*)userData;
280
279
        return 0;
281
280
}
409
408
 
410
409
//TYPE_MODEL_FUNC(Height, height); // ::ModelHeight()
411
410
//TYPE_MODEL_FUNC(Radius, radius); // ::ModelRadius()
412
 
TYPE_MODEL_FUNC(Minx,   minx);
 
411
TYPE_MODEL_FUNC(Minx,   mins.x);
413
412
TYPE_MODEL_FUNC(Midx,   relMidPos.x);
414
 
TYPE_MODEL_FUNC(Maxx,   maxx);
415
 
TYPE_MODEL_FUNC(Miny,   miny);
 
413
TYPE_MODEL_FUNC(Maxx,   maxs.x);
 
414
TYPE_MODEL_FUNC(Miny,   mins.y);
416
415
TYPE_MODEL_FUNC(Midy,   relMidPos.y);
417
 
TYPE_MODEL_FUNC(Maxy,   maxy);
418
 
TYPE_MODEL_FUNC(Minz,   minz);
 
416
TYPE_MODEL_FUNC(Maxy,   maxs.y);
 
417
TYPE_MODEL_FUNC(Minz,   mins.z);
419
418
TYPE_MODEL_FUNC(Midz,   relMidPos.z);
420
 
TYPE_MODEL_FUNC(Maxz,   maxz);
 
419
TYPE_MODEL_FUNC(Maxz,   maxs.z);
421
420
 
422
421
 
423
422
/******************************************************************************/