From e5191f22be11fc26579bb5645aaeb44121152e93 Mon Sep 17 00:00:00 2001 From: gewlitys Date: Wed, 21 May 2003 01:49:33 +0000 Subject: [PATCH] Added PC version outtakes (part of bug #46), from chmmravatar git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@967 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/ChangeLog | 1 + sc2/content/comm/arilou/arilou.ts | 1 + sc2/content/comm/arilou/arilou.txt | 7 ++++ sc2/content/comm/blackur/blackur.ts | 1 + sc2/content/comm/blackur/blackur.txt | 8 +++++ sc2/content/comm/druuge/druuge.ts | 1 + sc2/content/comm/druuge/druuge.txt | 11 ++++++ sc2/content/comm/orz/orz.ts | 1 + sc2/content/comm/orz/orz.txt | 7 ++++ sc2/content/comm/pkunk/pkunk.ts | 1 + sc2/content/comm/pkunk/pkunk.txt | 10 ++++++ sc2/content/comm/shofixt/shofixt.ts | 1 + sc2/content/comm/shofixt/shofixt.txt | 14 ++++++++ sc2/content/comm/supox/supox.ts | 1 + sc2/content/comm/supox/supox.txt | 9 +++++ sc2/content/comm/syreen/syreen.ts | 1 + sc2/content/comm/syreen/syreen.txt | 11 ++++++ sc2/content/comm/talkpet/talkpet.ts | 1 + sc2/content/comm/talkpet/talkpet.txt | 12 +++++++ sc2/content/comm/thradd/thradd.ts | 1 + sc2/content/comm/thradd/thradd.txt | 8 +++++ sc2/content/comm/urquan/urquan.ts | 1 + sc2/content/comm/urquan/urquan.txt | 14 ++++++++ sc2/content/comm/utwig/utwig.ts | 1 + sc2/content/comm/utwig/utwig.txt | 14 ++++++++ sc2/content/comm/vux/vux.ts | 1 + sc2/content/comm/vux/vux.txt | 7 ++++ sc2/content/comm/yehat/yehat.ts | 1 + sc2/content/comm/yehat/yehat.txt | 8 +++++ sc2/content/comm/zoqfot/zoqfot.ts | 14 ++++++++ sc2/content/comm/zoqfot/zoqfot.txt | 45 +++++++++++++++++++++++++ sc2/src/msvc++/UrQuanMasters.dsp | 8 +++++ sc2/src/sc2code/comm/arilou/arilouc.c | 2 +- sc2/src/sc2code/comm/arilou/strings.h | 1 + sc2/src/sc2code/comm/blackur/blackurc.c | 2 +- sc2/src/sc2code/comm/blackur/strings.h | 1 + sc2/src/sc2code/comm/druuge/druugec.c | 2 +- sc2/src/sc2code/comm/druuge/strings.h | 1 + sc2/src/sc2code/comm/orz/orzc.c | 2 +- sc2/src/sc2code/comm/orz/strings.h | 1 + sc2/src/sc2code/comm/pkunk/pkunkc.c | 2 +- sc2/src/sc2code/comm/pkunk/strings.h | 1 + sc2/src/sc2code/comm/shofixt/shofixt.c | 2 +- sc2/src/sc2code/comm/shofixt/strings.h | 1 + sc2/src/sc2code/comm/supox/strings.h | 1 + sc2/src/sc2code/comm/supox/supoxc.c | 2 +- sc2/src/sc2code/comm/syreen/strings.h | 1 + sc2/src/sc2code/comm/syreen/syreenc.c | 2 +- sc2/src/sc2code/comm/talkpet/strings.h | 1 + sc2/src/sc2code/comm/talkpet/talkpet.c | 2 +- sc2/src/sc2code/comm/thradd/strings.h | 1 + sc2/src/sc2code/comm/thradd/thraddc.c | 2 +- sc2/src/sc2code/comm/urquan/strings.h | 1 + sc2/src/sc2code/comm/urquan/urquanc.c | 2 +- sc2/src/sc2code/comm/utwig/strings.h | 1 + sc2/src/sc2code/comm/utwig/utwigc.c | 2 +- sc2/src/sc2code/comm/vux/strings.h | 1 + sc2/src/sc2code/comm/vux/vuxc.c | 2 +- sc2/src/sc2code/comm/yehat/strings.h | 1 + sc2/src/sc2code/comm/yehat/yehatc.c | 2 +- sc2/src/sc2code/comm/zoqfot/strings.h | 14 ++++++++ sc2/src/sc2code/comm/zoqfot/zoqfotc.c | 16 --------- sc2/src/sc2code/credits.c | 38 +++++++++++++++++++++ sc2/src/sc2code/credits.h | 17 ++++++++++ sc2/src/sc2code/oscill.c | 4 +++ sc2/src/sc2code/oscill.h | 17 ++++++++++ sc2/src/sc2code/starcon.c | 3 ++ 67 files changed, 343 insertions(+), 30 deletions(-) create mode 100644 sc2/src/sc2code/credits.h create mode 100644 sc2/src/sc2code/oscill.h diff --git a/sc2/ChangeLog b/sc2/ChangeLog index 96e5c21dd..f6af1f8b4 100644 --- a/sc2/ChangeLog +++ b/sc2/ChangeLog @@ -1,4 +1,5 @@ Changes towards version 0.3: +- Added PC version outtakes, from chmmravatar - Fix crash in PlayStream when whole file is prebuffered and its not speech (bug #259) -Mika - Fix endian problem in colormap transform code (bug #137) -Mika diff --git a/sc2/content/comm/arilou/arilou.ts b/sc2/content/comm/arilou/arilou.ts index a57208402..4c59de8e9 100644 --- a/sc2/content/comm/arilou/arilou.ts +++ b/sc2/content/comm/arilou/arilou.ts @@ -94,3 +94,4 @@ #(APOLOGIZE_AT_HOMEWORLD) 5137,4977,8282 #(bye_angry_space) #(GOODBYE_ANGRY_SPACE) +#(OUT_TAKES) 6000,6000,3500,4000,3500 diff --git a/sc2/content/comm/arilou/arilou.txt b/sc2/content/comm/arilou/arilou.txt index 3f0620bda..2bac95753 100755 --- a/sc2/content/comm/arilou/arilou.txt +++ b/sc2/content/comm/arilou/arilou.txt @@ -502,4 +502,11 @@ G'bye. #(GOODBYE_ANGRY_SPACE) arilo059.ogg When you have resolved your conflict, we shall speak again. +#(OUT_TAKES) arilo060.ogg +Do you really believe Project Bluebook revealed EVERYTHING the Army Air Corps knew? +Do you know what REALLY happened at Roswell, New Mexico in the late 1940's? +Have you even heard about the Men in Black? +Do you have any friends who have `missing days'? +Do you sleep with your window unlocked? +Be seeing you... diff --git a/sc2/content/comm/blackur/blackur.ts b/sc2/content/comm/blackur/blackur.ts index deb8b67c6..f4f49a084 100644 --- a/sc2/content/comm/blackur/blackur.ts +++ b/sc2/content/comm/blackur/blackur.ts @@ -73,3 +73,4 @@ #(bye) #(GOODBYE_AND_DIE) 4587,5047,3465,3055 #(GAME_OVER_DUDE) 1432,3535,7250,6229,2804,2284,290 +#(OUT_TAKES) 3000,4000,3000,4500,3000,6000 diff --git a/sc2/content/comm/blackur/blackur.txt b/sc2/content/comm/blackur/blackur.txt index 032bff4f4..c30f9c3cb 100755 --- a/sc2/content/comm/blackur/blackur.txt +++ b/sc2/content/comm/blackur/blackur.txt @@ -383,4 +383,12 @@ and now we have eliminated the Starbase orbiting your planet Earth as well. Your efforts to resist us are futile. You are defeated! +#(OUT_TAKES) black045.ogg +We are the the Ur-Quan Kohr-Ah... +...The followers of the Path of Now and Forever! +You are filth. We shall cleanse. +You WILL be annigilated... I mean annihigated.. damn! +CUT! CUT! Let's start over! +Hey, mister director... can you PLEASE think of SOME other word besides... +...agnigilate... I mean, oh what's the use. I give up. diff --git a/sc2/content/comm/druuge/druuge.ts b/sc2/content/comm/druuge/druuge.ts index 80805b4e1..374544404 100644 --- a/sc2/content/comm/druuge/druuge.ts +++ b/sc2/content/comm/druuge/druuge.ts @@ -102,3 +102,4 @@ #(FAIR_DEAL) 5028,4055,5709 #(GOOD_DEAL) 6709 #(FINE_DEAL) 6450,5858,8432,7190,6830,9965,8522 +#(OUT_TAKES) 6000,6000,6000,3000,6000,6500,2500,3500 diff --git a/sc2/content/comm/druuge/druuge.txt b/sc2/content/comm/druuge/druuge.txt index 87c74ab65..0c29e9611 100755 --- a/sc2/content/comm/druuge/druuge.txt +++ b/sc2/content/comm/druuge/druuge.txt @@ -548,3 +548,14 @@ I shall be promoted at least three full steps! A new office! A benefits package! I feel so lucky, Captain, that you did not have the forethought to arrive here with a dozen empty tanks. Thank you! Thank you! Thank you! +#(OUT_TAKES) druug076.ogg +I hope you know that contract negotiations are going to be very rough... +...for my role in the sequel... yes, rough indeed. To begin with... +...I want ten percent of the royalties, creative control over my dialog... +...and a fat cut of the toy licenses. +What!? What did you say?! The sequel is going to be all about ME? +How wonderful! What an honor! What a great chance to move up the ladder towards... +...PRODUCER! +Forget everything I said about license fees! +It's an honor just to work with you! + diff --git a/sc2/content/comm/orz/orz.ts b/sc2/content/comm/orz/orz.ts index 5381dc53b..4a9a5d82c 100644 --- a/sc2/content/comm/orz/orz.ts +++ b/sc2/content/comm/orz/orz.ts @@ -113,3 +113,4 @@ #(ANGRY_TAALO_GOODBYE) 6930,5468,4536 #(HOSTILE_HELLO_1) 5798,3145 #(HOSTILE_HELLO_2) +#(OUT_TAKES) 3500,4000,3500,3500 diff --git a/sc2/content/comm/orz/orz.txt b/sc2/content/comm/orz/orz.txt index 255bd6795..50c9ea465 100755 --- a/sc2/content/comm/orz/orz.txt +++ b/sc2/content/comm/orz/orz.txt @@ -610,3 +610,10 @@ You are *sick* for the last time! #(HOSTILE_HELLO_2) orz073.ogg Nnnnnggggaaaahhhhh!!!!!! It is *dancing*!!!! +#(OUT_TAKES) orz074.ogg +*Happy campers* are the best. It is *happy* +HOLD IT! I'm getting sick of this stupid dialog! +Who wrote this stuff -- a five year old? +Okay, okay. I'll try it again *sigh*... +...*Happy* campers are best. It is good to *smell* you again... + diff --git a/sc2/content/comm/pkunk/pkunk.ts b/sc2/content/comm/pkunk/pkunk.ts index b0635957f..beafefdd3 100644 --- a/sc2/content/comm/pkunk/pkunk.ts +++ b/sc2/content/comm/pkunk/pkunk.ts @@ -181,3 +181,4 @@ #(FORTUNE_IS_6) 5638 #(FORTUNE_IS_7) 3174,4356,4427 #(FORTUNE_IS_8) +#(OUT_TAKES) 6000,3500,7000,7000,3000,4000,3000 diff --git a/sc2/content/comm/pkunk/pkunk.txt b/sc2/content/comm/pkunk/pkunk.txt index fc2d0434c..fe826b4c5 100755 --- a/sc2/content/comm/pkunk/pkunk.txt +++ b/sc2/content/comm/pkunk/pkunk.txt @@ -987,3 +987,13 @@ Sorry. #(FORTUNE_IS_8) pkunk122.ogg We have exhausted our capacity to foretell your future, Captain. Sorry. +#(OUT_TAKES) pkunk124.ogg +Ah, a final parting with our favorite seeker of enlightenment... how sad. +But wait! This doesn't have to be the end! +We have established a conduit from the reams of our Harmonic Awareness directly to you! +You can use this channel to ask us questions about your past lives, or your future destiny! +Just call 1-900-PKUNKRA... +...That's 1-900-PKUNKRA, 24 hours a day! +Only two bucks per minute. +(children under 18 must have parental permission before calling.) + diff --git a/sc2/content/comm/shofixt/shofixt.ts b/sc2/content/comm/shofixt/shofixt.ts index 089c273eb..14f622517 100644 --- a/sc2/content/comm/shofixt/shofixt.ts +++ b/sc2/content/comm/shofixt/shofixt.ts @@ -95,3 +95,4 @@ #(report1) #(NOTHING_NEW0) #(NOTHING_NEW1) +#(OUT_TAKES) 3500,6000,3000,3000,3500,4000,3000,3000,3500,4000 diff --git a/sc2/content/comm/shofixt/shofixt.txt b/sc2/content/comm/shofixt/shofixt.txt index 188e19998..bfecef32e 100755 --- a/sc2/content/comm/shofixt/shofixt.txt +++ b/sc2/content/comm/shofixt/shofixt.txt @@ -368,3 +368,17 @@ What's your report Nothing new to report #(NOTHING_NEW1) , sir. + +#(OUT_TAKES) shofi046.ogg +Ah, I see someone approaches, but who is it? +Ho, ho! It is the creature which I wrongly called a disgusting Ur-Quan slimewad... +...and a cowardly slug-spawn... +...and a pouchless lard-log freak... +...and a leprous, non-functional sex organ... +...and a wallowing, phlegm-filled Ogrunti belly-licker. +HA! My human friend has returned! +So what am I doing here, you ask? +I'M TRYING TO GET SOME REST, THAT'S WHAT!!! +I'll be lucky if I don't have a heart attack soon. +You have no idea how hard it is to personally replenish an entire species! + diff --git a/sc2/content/comm/supox/supox.ts b/sc2/content/comm/supox/supox.ts index 617a249b9..3fe017d67 100644 --- a/sc2/content/comm/supox/supox.ts +++ b/sc2/content/comm/supox/supox.ts @@ -94,3 +94,4 @@ #(name_3) #(name_40) #(name_41) +#(OUT_TAKES) 3000,3500,4000,3000,3500 diff --git a/sc2/content/comm/supox/supox.txt b/sc2/content/comm/supox/supox.txt index c4c0bfc4f..6796cdec7 100755 --- a/sc2/content/comm/supox/supox.txt +++ b/sc2/content/comm/supox/supox.txt @@ -392,3 +392,12 @@ The United Federation of Worlds The Empire of #(name_41) + +#(OUT_TAKES) supox056.ogg +Whew! I'm glad that's all over. +That was tough, playing second banana to the Utwig. +Now I'm hungry, but I'm sick and tired of sunlight, sunlight, sunlight! +I want some REAL food!!! +Like a hamburger or a steak... better yet... +...how about a dog! + diff --git a/sc2/content/comm/syreen/syreen.ts b/sc2/content/comm/syreen/syreen.ts index 85fc1400b..fc41470be 100644 --- a/sc2/content/comm/syreen/syreen.ts +++ b/sc2/content/comm/syreen/syreen.ts @@ -128,3 +128,4 @@ #(THEN_STOP_TALKING) 3935 #(LATER) 1993,751,691 #(SEX_GOODBYE) 3925,1843,3876,6299 +#(OUT_TAKES) 5500,5500,5000,5000,4000,3000,5500 diff --git a/sc2/content/comm/syreen/syreen.txt b/sc2/content/comm/syreen/syreen.txt index b90448174..118ea7409 100755 --- a/sc2/content/comm/syreen/syreen.txt +++ b/sc2/content/comm/syreen/syreen.txt @@ -673,3 +673,14 @@ now you must go! But you will remain always in my mind and heart and deep within me, I know that someday, when all this madness has come to an end we will be together like this... again. + +#(OUT_TAKES) syree071.ogg +In case you were wondering about me... don't worry! I'm doing fine! +In fact, I just talked with the designers and they have assured me... +...that the sequel will be all about me! Isn't that great! +They said they wanted to move away from the warrior mythos... +...and expand more into the healer cycle. +This may be my big chance! +The only thing I'm not sure about is the new costume they want me to wear. +They said this one would be REALLY revealing. + diff --git a/sc2/content/comm/talkpet/talkpet.ts b/sc2/content/comm/talkpet/talkpet.ts index 745688143..40b3b06bf 100644 --- a/sc2/content/comm/talkpet/talkpet.ts +++ b/sc2/content/comm/talkpet/talkpet.ts @@ -110,3 +110,4 @@ #(OK_ENOUGH_INFO) #(UMGAH_ALL_GONE) 6499,6289,5879,4907,5317,3666,3435,7140,4406,6089,6389,4737,2403,1773,5157,6730,1833,8272,3194,5478,3836,4777,1422,1942,5028,6519 #(HELLO_AFTER_COMPEL_URQUAN) 3000,2500 +#(OUT_TAKES) 4000,4000,4000,4000,4000,4000,3500,3500 diff --git a/sc2/content/comm/talkpet/talkpet.txt b/sc2/content/comm/talkpet/talkpet.txt index d9200818b..37efe59b2 100755 --- a/sc2/content/comm/talkpet/talkpet.txt +++ b/sc2/content/comm/talkpet/talkpet.txt @@ -618,3 +618,15 @@ I see you are speechless with approval. I'll be right over. WHAT ARE YOU DOING, IDIOT!! DON'T TALK TO ME! GO ATTACK THE SA-MATRA!! + +#(OUT_TAKES) talkp074.ogg +So! You probably thought I was dead... DIDN'T YOU!? +Well I'm not! I got away from the ship at the last second... +...and now I'm REALLY going to cause some trouble! +In fact, that's what the sequel is going to be about! +Yeah, that's the ticket! Me and my exciting adventures... +...as I conquer the galaxy for the greater glory of... ME! +It will have action! It will have drama! +It will have gratuitous alien sex scenes! +It's gonna be great! + diff --git a/sc2/content/comm/thradd/thradd.ts b/sc2/content/comm/thradd/thradd.ts index a5cd9bb5f..48b182c81 100644 --- a/sc2/content/comm/thradd/thradd.ts +++ b/sc2/content/comm/thradd/thradd.ts @@ -150,3 +150,4 @@ #(HAVING_FUN_WITH_ILWRATH_2) 4146,2523,2404,3705 #(GO_AWAY_FIGHTING_ILWRATH_1) 3004,4727,3706,4196,2964,4596,2754,5368 #(GO_AWAY_FIGHTING_ILWRATH_2) 2243,4927,3155,5668 +#(OUT_TAKES) 4000,5500,6000,4500,4500 diff --git a/sc2/content/comm/thradd/thradd.txt b/sc2/content/comm/thradd/thradd.txt index 962d2f2c2..ace5866f4 100755 --- a/sc2/content/comm/thradd/thradd.txt +++ b/sc2/content/comm/thradd/thradd.txt @@ -901,3 +901,11 @@ We have brought the Ilwrath to their knee equivalents! Now all that remains is the coup de grace -- their final annihilation! So clear my path, alien dog, before I blast it clear myself! +#(OUT_TAKES) thrad106.ogg +SNORT! I am furious and ready to KILL! +Throughout this entire game, I've done nothing but bluster and threaten! +I've had no opportunity to show my true skills as an actor, my depth and range. +No one knows my sensitivity... my gentle inner being. +SNORT! What if from now on I'm type-cast as a heavy?! +WHIMPER! Now Spielberg may NEVER call me! + diff --git a/sc2/content/comm/urquan/urquan.ts b/sc2/content/comm/urquan/urquan.ts index 496803d25..712660883 100644 --- a/sc2/content/comm/urquan/urquan.ts +++ b/sc2/content/comm/urquan/urquan.ts @@ -73,3 +73,4 @@ #(GENERAL_INFO_3) 7681,4867,5127,11106,9754,9934,5699,8352,3615 #(whats_up_4) #(GENERAL_INFO_4) 6850,8281,7782,4045,9053,8703,8713,7350,14771 +#(OUT_TAKES) 2500,2500,5500,6000,5000,3500,5000,6000,5500,3500,5000,3500 diff --git a/sc2/content/comm/urquan/urquan.txt b/sc2/content/comm/urquan/urquan.txt index 296d3da21..fce35d755 100755 --- a/sc2/content/comm/urquan/urquan.txt +++ b/sc2/content/comm/urquan/urquan.txt @@ -377,4 +377,18 @@ If we are defeated, you are defeated as well. The Kohr-Ah will be unleashed. They will begin a genocidal orgy, cleansing all known sentience. They will crack the slave shield around Earth and reduce the surface of your blue world to cinders. +#(OUT_TAKES) urqua043.ogg +Blah, blah, blah! +Mary had a little lamb! +I like to hold fuzzy little animals and give them huggie-wuggies. +You are probably wondering why an Ur-Quan is saying such stupid things. +Well, he isn't saying them. I am... that's right -- ME... +...the little guy down in the corner. +Since I've been stuck down here for this entire game... +...translating `Submit or Die!' into about a hundred different languages... +...I just thought I'd take this opportunity to express MY feelings. +You want to know what I think? +I think this whole game would have been better... +...if they'd done it as a musical! +That's what I think, but do the designers listen to me? NO! diff --git a/sc2/content/comm/utwig/utwig.ts b/sc2/content/comm/utwig/utwig.ts index f2085c996..a8a790915 100644 --- a/sc2/content/comm/utwig/utwig.ts +++ b/sc2/content/comm/utwig/utwig.ts @@ -114,3 +114,4 @@ #(DONT_NEED) 3194,2534,3705 #(HAVE_4_SHIPS) 6159 #(NO_ULTRON_AT_BOMB) 3450 +#(OUT_TAKES) 3500,3500,4000,4500,5000,3500,4500,4000,3500,5500 diff --git a/sc2/content/comm/utwig/utwig.txt b/sc2/content/comm/utwig/utwig.txt index 1ffa701ea..e6aea05a6 100755 --- a/sc2/content/comm/utwig/utwig.txt +++ b/sc2/content/comm/utwig/utwig.txt @@ -699,3 +699,17 @@ Take possession of four of our Jugger craft instantly. #(NO_ULTRON_AT_BOMB) utwig074.ogg We are the stewards of the Bomb. Taunting us buys you nothing. Go now! + +#(OUT_TAKES) utwig075.ogg +Hello again, heroic humanoid! +Ever since you returned the Ultron to us... +...everything has been WONDERFUL... just perfect! +Within just two days our factories will begin churning out... +...appropriate facial appliances, and I have already picked ou my first mask... +...the Domino of Unrivaled Merriment! +Yes, we are all ecstatic... even the High Proctor gambols... +...as she performs the Exultant Caper of Revelation! +Look how she leaps with the Ultron held high! +How she twirls, how she slips and tosses the Ultron into the air... OH NOOooooo!!! +(CRASH!!) + diff --git a/sc2/content/comm/vux/vux.ts b/sc2/content/comm/vux/vux.ts index 1a47d7b49..63b9e880a 100644 --- a/sc2/content/comm/vux/vux.ts +++ b/sc2/content/comm/vux/vux.ts @@ -99,3 +99,4 @@ #(GOODBYE_AND_DIE_HOSTILE_SPACE_2) 3005 #(GOODBYE_AND_DIE_HOSTILE_SPACE_3) #(GOODBYE_AND_DIE_HOSTILE_SPACE_4) +#(OUT_TAKES) 4000,2500,4000,4000,6000 diff --git a/sc2/content/comm/vux/vux.txt b/sc2/content/comm/vux/vux.txt index 371627a90..1b81f3efe 100755 --- a/sc2/content/comm/vux/vux.txt +++ b/sc2/content/comm/vux/vux.txt @@ -513,4 +513,11 @@ For the good of the whole, I will now erase your putrid presence. #(GOODBYE_AND_DIE_HOSTILE_SPACE_4) vux059.ogg We have no choice. You are too wretched. We shall eliminate you. +#(OUT_TAKES) vux060.ogg +Oh no! It's one of those ultra-gross humans again! +Quick, hide your eye! +AGGH! Look at the pulpy red thing in its mouth... +...how it wriggles and writhes like a wet blood worm... +...and plays over the hard white nubs that protrude from its headbone! +I think I'm going to be sick. diff --git a/sc2/content/comm/yehat/yehat.ts b/sc2/content/comm/yehat/yehat.ts index dcce734c7..d7cd29e27 100644 --- a/sc2/content/comm/yehat/yehat.ts +++ b/sc2/content/comm/yehat/yehat.ts @@ -72,3 +72,4 @@ #(name_3) #(name_40) #(name_41) +#(OUT_TAKES) 6000,3000,2500,2750,7000,6000 diff --git a/sc2/content/comm/yehat/yehat.txt b/sc2/content/comm/yehat/yehat.txt index 84fd356b2..9da2515d4 100755 --- a/sc2/content/comm/yehat/yehat.txt +++ b/sc2/content/comm/yehat/yehat.txt @@ -358,4 +358,12 @@ The United Federation of Worlds The Empire of #(name_41) +#(OUT_TAKES) yehat039.ogg +So, I suppose you are wondering what I'm doing at this control console... +...well, I guess I can tell you now. +I'm writing a screenplay! +It's an existential thriller! +Kind of a cross between a Woody Allen angst-fest mixed with some of Tobe Hooper's best work. +But actually, this is just my way of getting my wing in the door, you see... +...what I really want to do is DIRECT! diff --git a/sc2/content/comm/zoqfot/zoqfot.ts b/sc2/content/comm/zoqfot/zoqfot.ts index c1cc876ed..f111703d2 100644 --- a/sc2/content/comm/zoqfot/zoqfot.ts +++ b/sc2/content/comm/zoqfot/zoqfot.ts @@ -321,3 +321,17 @@ #(name_3) #(name_40) #(name_41) +#(OUT_TAKES0) +#(OUT_TAKES1) 3500 +#(OUT_TAKES2) +#(OUT_TAKES3) +#(OUT_TAKES4) 3500,4000 +#(OUT_TAKES5) +#(OUT_TAKES6) +#(OUT_TAKES7) +#(OUT_TAKES8) +#(OUT_TAKES9) +#(OUT_TAKES10) +#(OUT_TAKES11) +#(OUT_TAKES12) +#(OUT_TAKES13) diff --git a/sc2/content/comm/zoqfot/zoqfot.txt b/sc2/content/comm/zoqfot/zoqfot.txt index 41e0a0057..a2a47d2bc 100755 --- a/sc2/content/comm/zoqfot/zoqfot.txt +++ b/sc2/content/comm/zoqfot/zoqfot.txt @@ -928,3 +928,48 @@ The Empire of #(name_41) 's +#(OUT_TAKES0) zoqfo291.ogg +Thank you for playing The Ur-Quan Masters. + +#(OUT_TAKES1) zoqfo292.ogg +This game has been brought to you by... +...Frungy! The Sport of Kings! + +#(OUT_TAKES2) zoqfo293.ogg +No it wasn't! + +#(OUT_TAKES3) zoqfo293.ogg +Yes it was! + +#(OUT_TAKES4) zoqfo294.ogg +Frungy had nothing to do with it! +This game was about war, slavery, intolerance... +...heroism, justice, and the inevitable triumph of Good over Evil! + +#(OUT_TAKES5) zoqfo291.ogg +Are you crazy?! The developers got millions in Frungy endorsements! + +#(OUT_TAKES6) zoqfo293.ogg +No they didn't. + +#(OUT_TAKES7) zoqfo293.ogg +Yes they did. + +#(OUT_TAKES8) zoqfo293.ogg +No they didn't! + +#(OUT_TAKES9) zoqfo293.ogg +Yes they did! + +#(OUT_TAKES10) zoqfo293.ogg +Did not! + +#(OUT_TAKES11) zoqfo293.ogg +Did too! + +#(OUT_TAKES12) zoqfo293.ogg +Did not! + +#(OUT_TAKES13) zoqfo293.ogg +Did too! + diff --git a/sc2/src/msvc++/UrQuanMasters.dsp b/sc2/src/msvc++/UrQuanMasters.dsp index 73292a922..79023572f 100644 --- a/sc2/src/msvc++/UrQuanMasters.dsp +++ b/sc2/src/msvc++/UrQuanMasters.dsp @@ -2975,6 +2975,10 @@ SOURCE=..\sc2code\credits.c # End Source File # Begin Source File +SOURCE=..\sc2code\credits.h +# End Source File +# Begin Source File + SOURCE=..\sc2code\cyborg.c # End Source File # Begin Source File @@ -3135,6 +3139,10 @@ SOURCE=..\sc2code\oscill.c # End Source File # Begin Source File +SOURCE=..\sc2code\oscill.h +# End Source File +# Begin Source File + SOURCE=..\sc2code\outfit.c # End Source File # Begin Source File diff --git a/sc2/src/sc2code/comm/arilou/arilouc.c b/sc2/src/sc2code/comm/arilou/arilouc.c index e2040cf85..0e3951413 100644 --- a/sc2/src/sc2code/comm/arilou/arilouc.c +++ b/sc2/src/sc2code/comm/arilou/arilouc.c @@ -623,7 +623,7 @@ Intro (void) if (LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE) { -// NPCPhrase (OUT_TAKES); + NPCPhrase (OUT_TAKES); SET_GAME_STATE (BATTLE_SEGUE, 0); goto ExitIntro; diff --git a/sc2/src/sc2code/comm/arilou/strings.h b/sc2/src/sc2code/comm/arilou/strings.h index aa72b5ec3..807dde081 100644 --- a/sc2/src/sc2code/comm/arilou/strings.h +++ b/sc2/src/sc2code/comm/arilou/strings.h @@ -118,6 +118,7 @@ enum APOLOGIZE_AT_HOMEWORLD, bye_angry_space, GOODBYE_ANGRY_SPACE, + OUT_TAKES, }; #endif /* _STRINGS_H */ diff --git a/sc2/src/sc2code/comm/blackur/blackurc.c b/sc2/src/sc2code/comm/blackur/blackurc.c index 7584b1a09..8d95fda18 100644 --- a/sc2/src/sc2code/comm/blackur/blackurc.c +++ b/sc2/src/sc2code/comm/blackur/blackurc.c @@ -425,7 +425,7 @@ Intro (void) if (LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE) { -// NPCPhrase (OUT_TAKES); + NPCPhrase (OUT_TAKES); SET_GAME_STATE (BATTLE_SEGUE, 0); goto ExitIntro; diff --git a/sc2/src/sc2code/comm/blackur/strings.h b/sc2/src/sc2code/comm/blackur/strings.h index 8173a4003..c2510f044 100644 --- a/sc2/src/sc2code/comm/blackur/strings.h +++ b/sc2/src/sc2code/comm/blackur/strings.h @@ -97,6 +97,7 @@ enum bye, GOODBYE_AND_DIE, GAME_OVER_DUDE, + OUT_TAKES, }; #endif /* _STRINGS_H */ diff --git a/sc2/src/sc2code/comm/druuge/druugec.c b/sc2/src/sc2code/comm/druuge/druugec.c index b23094abe..b9ab87eaf 100644 --- a/sc2/src/sc2code/comm/druuge/druugec.c +++ b/sc2/src/sc2code/comm/druuge/druugec.c @@ -666,7 +666,7 @@ Intro (void) if (LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE) { -// NPCPhrase (OUT_TAKES); + NPCPhrase (OUT_TAKES); SET_GAME_STATE (BATTLE_SEGUE, 0); goto ExitIntro; diff --git a/sc2/src/sc2code/comm/druuge/strings.h b/sc2/src/sc2code/comm/druuge/strings.h index 2567f39f7..346f1f6c2 100644 --- a/sc2/src/sc2code/comm/druuge/strings.h +++ b/sc2/src/sc2code/comm/druuge/strings.h @@ -126,6 +126,7 @@ enum FAIR_DEAL, GOOD_DEAL, FINE_DEAL, + OUT_TAKES, }; #endif /* _STRINGS_H */ diff --git a/sc2/src/sc2code/comm/orz/orzc.c b/sc2/src/sc2code/comm/orz/orzc.c index 1b47a44eb..dde6a4466 100644 --- a/sc2/src/sc2code/comm/orz/orzc.c +++ b/sc2/src/sc2code/comm/orz/orzc.c @@ -624,7 +624,7 @@ Intro (void) if (LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE) { -// NPCPhrase (OUT_TAKES); + NPCPhrase (OUT_TAKES); SET_GAME_STATE (BATTLE_SEGUE, 0); goto ExitIntro; diff --git a/sc2/src/sc2code/comm/orz/strings.h b/sc2/src/sc2code/comm/orz/strings.h index d6267e679..91c40ff40 100644 --- a/sc2/src/sc2code/comm/orz/strings.h +++ b/sc2/src/sc2code/comm/orz/strings.h @@ -137,6 +137,7 @@ enum ANGRY_TAALO_GOODBYE, HOSTILE_HELLO_1, HOSTILE_HELLO_2, + OUT_TAKES, }; #endif /* _STRINGS_H */ diff --git a/sc2/src/sc2code/comm/pkunk/pkunkc.c b/sc2/src/sc2code/comm/pkunk/pkunkc.c index 51458e8f8..293663432 100644 --- a/sc2/src/sc2code/comm/pkunk/pkunkc.c +++ b/sc2/src/sc2code/comm/pkunk/pkunkc.c @@ -831,7 +831,7 @@ Intro (void) if (LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE) { -// NPCPhrase (OUT_TAKES); + NPCPhrase (OUT_TAKES); SET_GAME_STATE (BATTLE_SEGUE, 0); goto ExitIntro; diff --git a/sc2/src/sc2code/comm/pkunk/strings.h b/sc2/src/sc2code/comm/pkunk/strings.h index af6d67166..c74608dae 100644 --- a/sc2/src/sc2code/comm/pkunk/strings.h +++ b/sc2/src/sc2code/comm/pkunk/strings.h @@ -205,6 +205,7 @@ enum FORTUNE_IS_6, FORTUNE_IS_7, FORTUNE_IS_8, + OUT_TAKES, }; #endif /* _STRINGS_H */ diff --git a/sc2/src/sc2code/comm/shofixt/shofixt.c b/sc2/src/sc2code/comm/shofixt/shofixt.c index 94e50276c..963d9c60d 100644 --- a/sc2/src/sc2code/comm/shofixt/shofixt.c +++ b/sc2/src/sc2code/comm/shofixt/shofixt.c @@ -531,7 +531,7 @@ Intro (void) { if (LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE) { -// NPCPhrase (OUT_TAKES); + NPCPhrase (OUT_TAKES); SET_GAME_STATE (BATTLE_SEGUE, 0); goto ExitIntro; diff --git a/sc2/src/sc2code/comm/shofixt/strings.h b/sc2/src/sc2code/comm/shofixt/strings.h index 2fbf6a438..321854698 100644 --- a/sc2/src/sc2code/comm/shofixt/strings.h +++ b/sc2/src/sc2code/comm/shofixt/strings.h @@ -119,6 +119,7 @@ enum report1, NOTHING_NEW0, NOTHING_NEW1, + OUT_TAKES, }; #endif /* _STRINGS_H */ diff --git a/sc2/src/sc2code/comm/supox/strings.h b/sc2/src/sc2code/comm/supox/strings.h index 403526883..d24aa5d50 100644 --- a/sc2/src/sc2code/comm/supox/strings.h +++ b/sc2/src/sc2code/comm/supox/strings.h @@ -118,6 +118,7 @@ enum name_3, name_40, name_41, + OUT_TAKES, }; #endif /* _STRINGS_H */ diff --git a/sc2/src/sc2code/comm/supox/supoxc.c b/sc2/src/sc2code/comm/supox/supoxc.c index f2269d475..e90b53d9e 100644 --- a/sc2/src/sc2code/comm/supox/supoxc.c +++ b/sc2/src/sc2code/comm/supox/supoxc.c @@ -513,7 +513,7 @@ Intro (void) if (LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE) { -// NPCPhrase (OUT_TAKES); + NPCPhrase (OUT_TAKES); SET_GAME_STATE (BATTLE_SEGUE, 0); goto ExitIntro; diff --git a/sc2/src/sc2code/comm/syreen/strings.h b/sc2/src/sc2code/comm/syreen/strings.h index 832cc7608..2454279d4 100644 --- a/sc2/src/sc2code/comm/syreen/strings.h +++ b/sc2/src/sc2code/comm/syreen/strings.h @@ -152,6 +152,7 @@ enum THEN_STOP_TALKING, LATER, SEX_GOODBYE, + OUT_TAKES, }; #endif /* _STRINGS_H */ diff --git a/sc2/src/sc2code/comm/syreen/syreenc.c b/sc2/src/sc2code/comm/syreen/syreenc.c index f66ae1cb2..544c4e5a1 100644 --- a/sc2/src/sc2code/comm/syreen/syreenc.c +++ b/sc2/src/sc2code/comm/syreen/syreenc.c @@ -701,7 +701,7 @@ Intro (void) if (LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE) { -// NPCPhrase (OUT_TAKES); + NPCPhrase (OUT_TAKES); SET_GAME_STATE (BATTLE_SEGUE, 0); goto ExitIntro; diff --git a/sc2/src/sc2code/comm/talkpet/strings.h b/sc2/src/sc2code/comm/talkpet/strings.h index 2bbd5b63f..a0f5ad771 100644 --- a/sc2/src/sc2code/comm/talkpet/strings.h +++ b/sc2/src/sc2code/comm/talkpet/strings.h @@ -134,6 +134,7 @@ enum OK_ENOUGH_INFO, UMGAH_ALL_GONE, HELLO_AFTER_COMPEL_URQUAN, + OUT_TAKES, }; #endif /* _STRINGS_H */ diff --git a/sc2/src/sc2code/comm/talkpet/talkpet.c b/sc2/src/sc2code/comm/talkpet/talkpet.c index 135eeffaa..a551724c7 100644 --- a/sc2/src/sc2code/comm/talkpet/talkpet.c +++ b/sc2/src/sc2code/comm/talkpet/talkpet.c @@ -634,7 +634,7 @@ Intro (void) if (LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE) { -// NPCPhrase (OUT_TAKES); + NPCPhrase (OUT_TAKES); SET_GAME_STATE (BATTLE_SEGUE, 0); goto ExitIntro; diff --git a/sc2/src/sc2code/comm/thradd/strings.h b/sc2/src/sc2code/comm/thradd/strings.h index 1f1a4b99f..539113353 100644 --- a/sc2/src/sc2code/comm/thradd/strings.h +++ b/sc2/src/sc2code/comm/thradd/strings.h @@ -174,6 +174,7 @@ enum HAVING_FUN_WITH_ILWRATH_2, GO_AWAY_FIGHTING_ILWRATH_1, GO_AWAY_FIGHTING_ILWRATH_2, + OUT_TAKES, }; #endif /* _STRINGS_H */ diff --git a/sc2/src/sc2code/comm/thradd/thraddc.c b/sc2/src/sc2code/comm/thradd/thraddc.c index 4ec936f17..c7b80fbea 100644 --- a/sc2/src/sc2code/comm/thradd/thraddc.c +++ b/sc2/src/sc2code/comm/thradd/thraddc.c @@ -672,7 +672,7 @@ Intro (void) if (LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE) { -// NPCPhrase (OUT_TAKES); + NPCPhrase (OUT_TAKES); SET_GAME_STATE (BATTLE_SEGUE, 0); goto ExitIntro; diff --git a/sc2/src/sc2code/comm/urquan/strings.h b/sc2/src/sc2code/comm/urquan/strings.h index 6a21fd2dc..193634f09 100644 --- a/sc2/src/sc2code/comm/urquan/strings.h +++ b/sc2/src/sc2code/comm/urquan/strings.h @@ -95,6 +95,7 @@ enum GENERAL_INFO_3, whats_up_4, GENERAL_INFO_4, + OUT_TAKES, }; #endif /* _STRINGS_H */ diff --git a/sc2/src/sc2code/comm/urquan/urquanc.c b/sc2/src/sc2code/comm/urquan/urquanc.c index b520a1799..0a3ac714d 100644 --- a/sc2/src/sc2code/comm/urquan/urquanc.c +++ b/sc2/src/sc2code/comm/urquan/urquanc.c @@ -396,7 +396,7 @@ Intro (void) if (LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE) { -// NPCPhrase (OUT_TAKES); + NPCPhrase (OUT_TAKES); SET_GAME_STATE (BATTLE_SEGUE, 0); goto ExitIntro; diff --git a/sc2/src/sc2code/comm/utwig/strings.h b/sc2/src/sc2code/comm/utwig/strings.h index 3fef59289..1a108f5aa 100644 --- a/sc2/src/sc2code/comm/utwig/strings.h +++ b/sc2/src/sc2code/comm/utwig/strings.h @@ -138,6 +138,7 @@ enum DONT_NEED, HAVE_4_SHIPS, NO_ULTRON_AT_BOMB, + OUT_TAKES, }; #endif /* _STRINGS_H */ diff --git a/sc2/src/sc2code/comm/utwig/utwigc.c b/sc2/src/sc2code/comm/utwig/utwigc.c index e24db34ae..dbf24648a 100644 --- a/sc2/src/sc2code/comm/utwig/utwigc.c +++ b/sc2/src/sc2code/comm/utwig/utwigc.c @@ -709,7 +709,7 @@ Intro (void) if (LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE) { -// NPCPhrase (OUT_TAKES); + NPCPhrase (OUT_TAKES); SET_GAME_STATE (BATTLE_SEGUE, 0); goto ExitIntro; diff --git a/sc2/src/sc2code/comm/vux/strings.h b/sc2/src/sc2code/comm/vux/strings.h index 5dc74603a..7aafcf820 100644 --- a/sc2/src/sc2code/comm/vux/strings.h +++ b/sc2/src/sc2code/comm/vux/strings.h @@ -123,6 +123,7 @@ enum GOODBYE_AND_DIE_HOSTILE_SPACE_2, GOODBYE_AND_DIE_HOSTILE_SPACE_3, GOODBYE_AND_DIE_HOSTILE_SPACE_4, + OUT_TAKES, }; #endif /* _STRINGS_H */ diff --git a/sc2/src/sc2code/comm/vux/vuxc.c b/sc2/src/sc2code/comm/vux/vuxc.c index 7dd787c62..f63bee56e 100644 --- a/sc2/src/sc2code/comm/vux/vuxc.c +++ b/sc2/src/sc2code/comm/vux/vuxc.c @@ -669,7 +669,7 @@ Intro (void) { if (LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE) { -// NPCPhrase (OUT_TAKES); + NPCPhrase (OUT_TAKES); SET_GAME_STATE (BATTLE_SEGUE, 0); goto ExitIntro; diff --git a/sc2/src/sc2code/comm/yehat/strings.h b/sc2/src/sc2code/comm/yehat/strings.h index 1bcd8fe19..810887f63 100644 --- a/sc2/src/sc2code/comm/yehat/strings.h +++ b/sc2/src/sc2code/comm/yehat/strings.h @@ -96,6 +96,7 @@ enum name_3, name_40, name_41, + OUT_TAKES, }; #endif /* _STRINGS_H */ diff --git a/sc2/src/sc2code/comm/yehat/yehatc.c b/sc2/src/sc2code/comm/yehat/yehatc.c index 9c1e1e467..f09cb0c76 100644 --- a/sc2/src/sc2code/comm/yehat/yehatc.c +++ b/sc2/src/sc2code/comm/yehat/yehatc.c @@ -549,7 +549,7 @@ Intro (void) if (LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE) { -// NPCPhrase (OUT_TAKES); + NPCPhrase (OUT_TAKES); SET_GAME_STATE (BATTLE_SEGUE, 0); goto ExitIntro; diff --git a/sc2/src/sc2code/comm/zoqfot/strings.h b/sc2/src/sc2code/comm/zoqfot/strings.h index f1ec9ab45..a6a0769f7 100644 --- a/sc2/src/sc2code/comm/zoqfot/strings.h +++ b/sc2/src/sc2code/comm/zoqfot/strings.h @@ -345,6 +345,20 @@ enum name_3, name_40, name_41, + OUT_TAKES0, + OUT_TAKES1, + OUT_TAKES2, + OUT_TAKES3, + OUT_TAKES4, + OUT_TAKES5, + OUT_TAKES6, + OUT_TAKES7, + OUT_TAKES8, + OUT_TAKES9, + OUT_TAKES10, + OUT_TAKES11, + OUT_TAKES12, + OUT_TAKES13, }; #endif /* _STRINGS_H */ diff --git a/sc2/src/sc2code/comm/zoqfot/zoqfotc.c b/sc2/src/sc2code/comm/zoqfot/zoqfotc.c index 4437691f8..9b37a4cdc 100644 --- a/sc2/src/sc2code/comm/zoqfot/zoqfotc.c +++ b/sc2/src/sc2code/comm/zoqfot/zoqfotc.c @@ -740,7 +740,6 @@ Intro (void) if (LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE) { -#ifdef NOT_YET NPCPhrase_cb (OUT_TAKES0, &SelectAlienZOQ); NPCPhrase_cb (OUT_TAKES1, &SelectAlienPIK); NPCPhrase_cb (OUT_TAKES2, &SelectAlienZOQ); @@ -756,21 +755,6 @@ Intro (void) NPCPhrase_cb (OUT_TAKES12, &SelectAlienZOQ); NPCPhrase_cb (OUT_TAKES13, &SelectAlienPIK); ZFPTalkSegue ((COUNT)~0); -#else /* YET */ - NPCPhrase_cb (WE_ARE0, &SelectAlienZOQ); - NPCPhrase_cb (WE_ARE1, &SelectAlienPIK); - NPCPhrase_cb (WE_ARE2, &SelectAlienZOQ); - NPCPhrase_cb (WE_ARE3, &SelectAlienPIK); - NPCPhrase_cb (WE_ARE4, &SelectAlienZOQ); - NPCPhrase_cb (WE_ARE5, &SelectAlienPIK); - NPCPhrase_cb (WE_ARE6, &SelectAlienZOQ); - NPCPhrase_cb (WE_ARE7, &SelectAlienPIK); - NPCPhrase_cb (SCOUT_HELLO0, &SelectAlienZOQ); - NPCPhrase_cb (SCOUT_HELLO1, &SelectAlienPIK); - NPCPhrase_cb (SCOUT_HELLO2, &SelectAlienZOQ); - NPCPhrase_cb (SCOUT_HELLO3, &SelectAlienPIK); - ZFPTalkSegue ((COUNT)~0); -#endif /* NOT_YET */ SET_GAME_STATE (BATTLE_SEGUE, 0); goto ExitIntro; } diff --git a/sc2/src/sc2code/credits.c b/sc2/src/sc2code/credits.c index f611e1c2a..06dc22694 100644 --- a/sc2/src/sc2code/credits.c +++ b/sc2/src/sc2code/credits.c @@ -18,6 +18,8 @@ #include "starcon.h" #include "libs/graphics/gfx_common.h" +#include "libs/sound/sound_common.h" +#include "oscill.h" //Added by Chris @@ -115,4 +117,40 @@ FreeHyperData (); } } +void +OutTakes (void) +{ + RECT r; + float oldvolume = speechVolumeScale; + speechVolumeScale = 0.0f; + sliderDisabled = TRUE; + + SetSemaphore (GraphicsSem); + SetContext (ScreenContext); + SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x0, 0x0, 0x0), 0x00)); + r.corner.x = r.corner.y = 0; + r.extent.width = SCREEN_WIDTH; + r.extent.height = SCREEN_HEIGHT; + DrawFilledRectangle (&r); + ClearSemaphore (GraphicsSem); + + InitCommunication (ZOQFOTPIK_CONVERSATION); + InitCommunication (TALKING_PET_CONVERSATION); + InitCommunication (ORZ_CONVERSATION); + InitCommunication (UTWIG_CONVERSATION); + InitCommunication (THRADD_CONVERSATION); + InitCommunication (SUPOX_CONVERSATION); + InitCommunication (SYREEN_CONVERSATION); + InitCommunication (SHOFIXTI_CONVERSATION); + InitCommunication (PKUNK_CONVERSATION); + InitCommunication (YEHAT_CONVERSATION); + InitCommunication (DRUUGE_CONVERSATION); + InitCommunication (URQUAN_CONVERSATION); + InitCommunication (VUX_CONVERSATION); + InitCommunication (BLACKURQ_CONVERSATION); + InitCommunication (ARILOU_CONVERSATION); + + speechVolumeScale = oldvolume; + sliderDisabled = FALSE; +} diff --git a/sc2/src/sc2code/credits.h b/sc2/src/sc2code/credits.h new file mode 100644 index 000000000..3632cacda --- /dev/null +++ b/sc2/src/sc2code/credits.h @@ -0,0 +1,17 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +void OutTakes (void); diff --git a/sc2/src/sc2code/oscill.c b/sc2/src/sc2code/oscill.c index c5b37f2ee..abccc34aa 100644 --- a/sc2/src/sc2code/oscill.c +++ b/sc2/src/sc2code/oscill.c @@ -92,6 +92,7 @@ static STAMP sliderStamp; static STAMP buttonStamp; static BOOLEAN sliderChanged = FALSE; int sliderSpace; // slider width - button width +BOOLEAN sliderDisabled = FALSE; /* * Initialise the communication progress bar @@ -128,6 +129,9 @@ Slider (void) { int offs; static int last_offs = -1; + + if (sliderDisabled) + return; if ((offs = GetSoundInfo (sliderSpace)) != last_offs ||sliderChanged) { diff --git a/sc2/src/sc2code/oscill.h b/sc2/src/sc2code/oscill.h new file mode 100644 index 000000000..3d844fede --- /dev/null +++ b/sc2/src/sc2code/oscill.h @@ -0,0 +1,17 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +extern BOOLEAN sliderDisabled; diff --git a/sc2/src/sc2code/starcon.c b/sc2/src/sc2code/starcon.c index 0eebe4772..58433eb91 100644 --- a/sc2/src/sc2code/starcon.c +++ b/sc2/src/sc2code/starcon.c @@ -17,6 +17,7 @@ */ #include "starcon.h" +#include "credits.h" //Added by Chris @@ -989,6 +990,8 @@ sc = _simple_count; if (GET_GAME_STATE (KOHR_AH_KILLED_ALL)) InitCommunication (BLACKURQ_CONVERSATION); //surrendered to Ur-Quan + else if (LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE) + OutTakes (); else if (GLOBAL (CurrentActivity) & CHECK_RESTART) GLOBAL (CurrentActivity) &= ~CHECK_RESTART; break;