From 236e2da22002ce5133dfd265749bb412a40e3b94 Mon Sep 17 00:00:00 2001 From: div0 Date: Wed, 23 Jan 2008 23:57:50 +0000 Subject: [PATCH] fix winner dialog; make NexuizImage be able to take over original image aspect git-svn-id: svn://svn.icculus.org/nexuiz/trunk@3255 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/menu/nexuiz/dialog_singleplayer_winner.c | 2 +- data/qcsrc/menu/nexuiz/image.c | 9 ++++++++- data/qcsrc/menu/nexuiz/util.qc | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/data/qcsrc/menu/nexuiz/dialog_singleplayer_winner.c b/data/qcsrc/menu/nexuiz/dialog_singleplayer_winner.c index 6f6bc25a1..8773bd5b0 100644 --- a/data/qcsrc/menu/nexuiz/dialog_singleplayer_winner.c +++ b/data/qcsrc/menu/nexuiz/dialog_singleplayer_winner.c @@ -15,7 +15,7 @@ void fillNexuizWinnerDialog(entity me) entity e; me.TR(me); - me.TD(me, me.rows - 2, me.columns, e = makeNexuizImage("/gfx/winner", 1.0)); + me.TD(me, me.rows - 2, me.columns, e = makeNexuizImage("/gfx/winner", -1)); me.gotoRC(me, me.rows - 1, 0); me.TD(me, 1, me.columns, e = makeNexuizButton("OK", '0 0 0')); diff --git a/data/qcsrc/menu/nexuiz/image.c b/data/qcsrc/menu/nexuiz/image.c index 8c8404fea..d646fe2f6 100644 --- a/data/qcsrc/menu/nexuiz/image.c +++ b/data/qcsrc/menu/nexuiz/image.c @@ -16,6 +16,13 @@ entity makeNexuizImage(string theImage, float theAspect) void configureNexuizImageNexuizImage(entity me, string theImage, float theAspect) { me.configureImage(me, theImage); - me.forcedAspect = theAspect; + if(theAspect < 0) // use image aspect + { + vector sz; + sz = draw_PictureSize(theImage); + me.forcedAspect = sz_x / sz_y; + } + else + me.forcedAspect = theAspect; } #endif diff --git a/data/qcsrc/menu/nexuiz/util.qc b/data/qcsrc/menu/nexuiz/util.qc index 8ff952e7f..ad88d2586 100644 --- a/data/qcsrc/menu/nexuiz/util.qc +++ b/data/qcsrc/menu/nexuiz/util.qc @@ -215,7 +215,7 @@ void preMenuDraw() if(!campaign_won_previous) { m_display(); - DialogOpenButton_Click_withCoords(NULL, main.winnerDialog, '0 0 0', '1 1 0'); + DialogOpenButton_Click_withCoords(NULL, main.winnerDialog, '0 0 0', eX * conwidth + eY * conheight); } campaign_won_previous = 1; } -- 2.39.2