|
Last change
on this file since 7496 was
6746,
checked in by rgrieder, 15 years ago
|
|
Merged gamestates2 branch back to trunk.
This brings in some heavy changes in the GUI framework.
It should also fix problems with triggered asserts in the InputManager.
Note: PickupInventory does not seem to work —> Segfault when showing because before, the owner in GUIOverlay::setGUIName is already NULL.
I haven't tested it before, so I can't tell whether it's my changes.
|
-
Property svn:eol-style set to
native
|
|
File size:
462 bytes
|
| Line | |
|---|
| 1 | function handleDefArg(argument, defaultValue) |
|---|
| 2 | if argument == nil then |
|---|
| 3 | return defaultValue |
|---|
| 4 | else |
|---|
| 5 | return argument |
|---|
| 6 | end |
|---|
| 7 | end |
|---|
| 8 | |
|---|
| 9 | function table.findIndex(table, value) |
|---|
| 10 | for i, v in ipairs(table) do |
|---|
| 11 | if v == value then |
|---|
| 12 | return i |
|---|
| 13 | end |
|---|
| 14 | end |
|---|
| 15 | return 0 |
|---|
| 16 | end |
|---|
| 17 | |
|---|
| 18 | -- Short forms for TriBool |
|---|
| 19 | TriBool = |
|---|
| 20 | { |
|---|
| 21 | True = orxonox.TriBool.True, |
|---|
| 22 | False = orxonox.TriBool.False, |
|---|
| 23 | Dontcare = orxonox.TriBool.Dontcare |
|---|
| 24 | } |
|---|
Note: See
TracBrowser
for help on using the repository browser.
