diff options
| author | b_krueger <b_krueger@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-04-12 11:32:06 +0000 |
|---|---|---|
| committer | b_krueger <b_krueger@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-04-12 11:32:06 +0000 |
| commit | a8f65efc0151cb4da88691af775a1256fcc6b2f1 (patch) | |
| tree | 32414b3e18b0c729b1ab849ff1534012653df0c5 | |
| parent | 41faa3f947dc0f5abfe7890a44f295702c43d30e (diff) | |
| download | usdx-a8f65efc0151cb4da88691af775a1256fcc6b2f1.tar.gz usdx-a8f65efc0151cb4da88691af775a1256fcc6b2f1.tar.xz usdx-a8f65efc0151cb4da88691af775a1256fcc6b2f1.zip | |
BugFix
Plugin 5000points.usdx is now scoring correct
Plugin teamduel.usdx now shows both player names (from team 1 and team 2)
Maybe, the lua-plugins are not executed atomic (can go wrong on drawing in gl): please verify!
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2230 b956fd51-792f-4845-bead-9b4dfca2ff2c
| -rw-r--r-- | game/plugins/5000points.usdx | 4 | ||||
| -rw-r--r-- | game/plugins/teamduel.usdx | 5 | ||||
| -rw-r--r-- | src/lua/ULuaParty.pas | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/game/plugins/5000points.usdx b/game/plugins/5000points.usdx index 7ebd23b4..b48984f0 100644 --- a/game/plugins/5000points.usdx +++ b/game/plugins/5000points.usdx @@ -21,7 +21,7 @@ function Sing() Scores = ScreenSing.GetScores();
for i = 1, #Scores do
- if (Scores[i] >= 5000) then
+ if (Scores[i] >= 100) then
ScreenSing.Finish();
break;
end
@@ -34,7 +34,7 @@ function Calculate_Winner() Scores = Scores or ScreenSing.GetScores();
local Ranking = {};
for i = 1, #Scores do
- if Scores[i] >= 5000 then
+ if Scores[i] >= 100 then
Ranking[i] = 1
else
Ranking[i] = #Scores
diff --git a/game/plugins/teamduel.usdx b/game/plugins/teamduel.usdx index 844e53b0..a32d963d 100644 --- a/game/plugins/teamduel.usdx +++ b/game/plugins/teamduel.usdx @@ -130,13 +130,12 @@ function DrawPlayerText(i, Text) Gl.Vertex(OSD[i].Right, OSD[i].Bottom);
Gl.Vertex(OSD[i].Right, OSD[i].Top);
Gl.End();
-
+
-- text
Gl.Color(1, 0, 0, 1);
- TextGl.Size(6);
+ TextGl.Size(18);
TextGl.Style(1);
TextGl.Italic(false);
-
local PosX = (OSD[i].Left + OSD[i].Right) / 2;
PosX = PosX - TextGl.Width(Text) / 2;
diff --git a/src/lua/ULuaParty.pas b/src/lua/ULuaParty.pas index 883c3aec..69096e97 100644 --- a/src/lua/ULuaParty.pas +++ b/src/lua/ULuaParty.pas @@ -197,18 +197,20 @@ begin for I := 0 to High(R) do
begin
- lua_pushInteger(L, I);
+ lua_pushInteger(L, (I+1));
lua_gettable(L, 1);
R[I].Rank := Length(R);
+ R[I].Team := I;
if (lua_isnumber(L, -1)) then
begin
Rank := lua_toInteger(L, -1);
if (Rank >= 1) and (Rank <= Length(R)) then
- R[I].Rank := Rank;
+ R[I].Rank := Rank
end;
lua_pop(L, 1);
+
end;
// pop table
|