forked from zturtleman/oaunofficial
-
Notifications
You must be signed in to change notification settings - Fork 8
/
original.patch
9099 lines (7740 loc) · 231 KB
/
original.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff -rupN code-svn//botlib/.svn/entries code//botlib/.svn/entries
--- code-svn//botlib/.svn/entries 2010-05-06 12:48:18.000000000 +0200
+++ code//botlib/.svn/entries 2009-11-14 15:55:48.000000000 +0100
@@ -1,7 +1,7 @@
10
dir
-206
+182
http://oax.googlecode.com/svn/trunk/code/botlib
http://oax.googlecode.com/svn
@@ -32,7 +32,7 @@ file
-2009-12-03T12:43:06.000000Z
+2009-11-14T14:55:48.000000Z
f44cb51890a1c1ad7af628c3ea4086c6
2009-05-15T14:44:23.081931Z
2
@@ -66,7 +66,7 @@ file
-2009-12-03T12:43:06.000000Z
+2009-11-14T14:55:48.000000Z
68cae09b89c320ca3aebed8cfc30a469
2009-05-15T14:44:23.081931Z
2
@@ -100,7 +100,7 @@ file
-2009-12-03T12:43:06.000000Z
+2009-11-14T14:55:48.000000Z
22ea2d5d00f3f55ac19c15da9f2240a7
2009-05-15T14:44:23.081931Z
2
@@ -134,7 +134,7 @@ file
-2009-12-03T12:43:06.000000Z
+2009-11-14T14:55:48.000000Z
f31d5f30348085ab091014da0b438986
2009-05-15T14:44:23.081931Z
2
@@ -168,7 +168,7 @@ file
-2009-12-03T12:43:06.000000Z
+2009-11-14T14:55:48.000000Z
143e41bab7e673ae77c5fc95674abcf3
2009-05-15T14:44:23.081931Z
2
@@ -202,7 +202,7 @@ file
-2009-12-03T12:43:06.000000Z
+2009-11-14T14:55:48.000000Z
fa78a3c81f05dda3a1b94e72b69bb514
2009-05-15T14:44:23.081931Z
2
@@ -236,7 +236,7 @@ file
-2009-12-03T12:43:06.000000Z
+2009-11-14T14:55:48.000000Z
3fcafdd4ec5bef654567a8fa1a6f0bff
2009-05-15T14:44:23.081931Z
2
@@ -270,7 +270,7 @@ file
-2009-12-03T12:43:06.000000Z
+2009-11-14T14:55:48.000000Z
4ad43e039fb217326d67ff54e4af6fd1
2009-05-15T14:44:23.081931Z
2
@@ -304,7 +304,7 @@ file
-2009-12-03T12:43:06.000000Z
+2009-11-14T14:55:48.000000Z
52c81a94dbd39232c0900012e3bccd0b
2009-05-15T14:44:23.081931Z
2
@@ -338,7 +338,7 @@ file
-2009-12-03T12:43:06.000000Z
+2009-11-14T14:55:48.000000Z
710b75f0b5455211726a2787449af66e
2009-05-15T14:44:23.081931Z
2
@@ -372,7 +372,7 @@ file
-2009-12-03T12:43:06.000000Z
+2009-11-14T14:55:48.000000Z
2b85e765e16e283788f6495208a7562e
2009-05-15T14:44:23.081931Z
2
@@ -406,7 +406,7 @@ file
-2009-12-03T12:43:06.000000Z
+2009-11-14T14:55:48.000000Z
1b1e8e7f7a2f3a29acbf750f9243ce6a
2009-05-15T14:44:23.081931Z
2
@@ -440,7 +440,7 @@ file
-2009-12-03T12:43:06.000000Z
+2009-11-14T14:55:48.000000Z
fee8b6886ef7ec41bb35eb247ef91122
2009-05-15T14:44:23.081931Z
2
@@ -474,7 +474,7 @@ file
-2009-12-03T12:43:06.000000Z
+2009-11-14T14:55:48.000000Z
3f74ee100a6dc9c2244dc5cbf7242ad6
2009-05-15T14:44:23.081931Z
2
@@ -508,7 +508,7 @@ file
-2009-12-03T12:43:06.000000Z
+2009-11-14T14:55:48.000000Z
b363e2c140928dafdc03cdb5e3260af0
2009-05-15T14:44:23.081931Z
2
@@ -542,7 +542,7 @@ file
-2009-12-03T12:43:06.000000Z
+2009-11-14T14:55:48.000000Z
d955df7f8fc9f888338cfa1d53436fd6
2009-05-15T14:44:23.081931Z
2
@@ -576,7 +576,7 @@ file
-2009-12-03T12:43:06.000000Z
+2009-11-14T14:55:48.000000Z
f7d5d40a5e3d65653fbf5f7e3f32b99a
2009-05-15T14:44:23.081931Z
2
@@ -610,7 +610,7 @@ file
-2009-12-03T12:43:06.000000Z
+2009-11-14T14:55:48.000000Z
417bd98296e40defd061423796145309
2009-05-15T14:44:23.081931Z
2
@@ -644,7 +644,7 @@ file
-2009-12-03T12:43:06.000000Z
+2009-11-14T14:55:48.000000Z
251a4f3e3d062ec53ef69383189d463f
2009-05-15T14:44:23.081931Z
2
@@ -678,7 +678,7 @@ file
-2009-12-03T12:43:06.000000Z
+2009-11-14T14:55:48.000000Z
6ce1642c349a713fd37cf97ab38d4f39
2009-05-15T14:44:23.081931Z
2
@@ -712,7 +712,7 @@ file
-2009-12-03T12:43:06.000000Z
+2009-11-14T14:55:48.000000Z
b008ec08e88b66d8f8cd74abb115089e
2009-05-15T14:44:23.081931Z
2
@@ -746,7 +746,7 @@ file
-2009-12-03T12:43:06.000000Z
+2009-11-14T14:55:48.000000Z
bca24aa0536d47e3f99a733ab67d26ad
2009-05-15T14:44:23.081931Z
2
@@ -780,7 +780,7 @@ file
-2009-12-03T12:43:06.000000Z
+2009-11-14T14:55:48.000000Z
3470110fa342b4511524fecf0e68856b
2009-05-15T14:44:23.081931Z
2
@@ -814,7 +814,7 @@ file
-2009-12-03T12:43:06.000000Z
+2009-11-14T14:55:48.000000Z
da51bdd47ccbdc4d48bebccf34c915cd
2009-05-15T14:44:23.081931Z
2
@@ -848,7 +848,7 @@ file
-2009-12-03T12:43:06.000000Z
+2009-11-14T14:55:48.000000Z
4a0b7a67bc1b4cf0a5ae6c58894079d5
2009-05-15T14:44:23.081931Z
2
@@ -882,7 +882,7 @@ file
-2009-12-03T12:43:06.000000Z
+2009-11-14T14:55:48.000000Z
9f433ee22189780ec0ed34668ebb697e
2009-05-15T14:44:23.081931Z
2
@@ -916,7 +916,7 @@ file
-2009-12-03T12:43:06.000000Z
+2009-11-14T14:55:48.000000Z
8906acb5794ba35be61695a1406cab74
2009-05-15T14:44:23.081931Z
2
@@ -950,7 +950,7 @@ file
-2009-12-03T12:43:06.000000Z
+2009-11-14T14:55:48.000000Z
6b43d395f0eb828e656ee05a61939478
2009-05-15T14:44:23.081931Z
2
@@ -984,7 +984,7 @@ file
-2009-12-03T12:43:06.000000Z
+2009-11-14T14:55:48.000000Z
1015a2fe69565b284dd678e4a6831d8c
2009-05-15T14:44:23.081931Z
2
@@ -1018,7 +1018,7 @@ file
-2009-12-03T12:43:06.000000Z
+2009-11-14T14:55:48.000000Z
ca93cba58bda4ae98afa00566b438c27
2009-05-15T14:44:23.081931Z
2
@@ -1052,7 +1052,7 @@ file
-2009-12-03T12:43:06.000000Z
+2009-11-14T14:55:48.000000Z
632fdb4c2e59a11ac4903c1dd86e6cb3
2009-05-15T14:44:23.081931Z
2
@@ -1086,7 +1086,7 @@ file
-2009-12-03T12:43:06.000000Z
+2009-11-14T14:55:48.000000Z
aef0a62ea29348748d11330cbc6e049e
2009-05-15T14:44:23.081931Z
2
@@ -1120,7 +1120,7 @@ file
-2009-12-03T12:43:06.000000Z
+2009-11-14T14:55:48.000000Z
1ce240e6c634dd0cca2468eaf5d76445
2009-05-15T14:44:23.081931Z
2
@@ -1154,7 +1154,7 @@ file
-2009-12-03T12:43:06.000000Z
+2009-11-14T14:55:48.000000Z
a99bf41848e84f28d49a99087a68e65f
2009-05-15T14:44:23.081931Z
2
@@ -1188,7 +1188,7 @@ file
-2009-12-03T12:43:06.000000Z
+2009-11-14T14:55:48.000000Z
e0a5901603949b39a6fae396fc0caa45
2009-05-15T14:44:23.081931Z
2
@@ -1222,7 +1222,7 @@ file
-2009-12-03T12:43:06.000000Z
+2009-11-14T14:55:48.000000Z
6789bfe9645083259401ce7f79cac3e5
2009-05-15T14:44:23.081931Z
2
diff -rupN code-svn//cgame/cg_consolecmds.c code//cgame/cg_consolecmds.c
--- code-svn//cgame/cg_consolecmds.c 2010-02-01 18:12:08.000000000 +0100
+++ code//cgame/cg_consolecmds.c 2009-11-14 15:55:49.000000000 +0100
@@ -29,22 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth
extern menuDef_t *menuScoreboard;
#endif
-void CG_PrintClientNumbers( void ) {
- int i;
- CG_Printf( "slot score ping name\n" );
- CG_Printf( "---- ----- ---- ----\n" );
-
- for(i=0;i<cg.numScores;i++) {
- CG_Printf("%-4d",cg.scores[i].client);
-
- CG_Printf(" %-5d",cg.scores[i].score);
-
- CG_Printf(" %-4d",cg.scores[i].ping);
-
- CG_Printf(" %s\n",cgs.clientinfo[cg.scores[i].client].name);
- }
-}
void CG_TargetCommand_f( void ) {
int targetNum;
@@ -515,8 +500,7 @@ static consoleCommand_t commands[] = {
#endif
{ "startOrbit", CG_StartOrbit_f },
//{ "camera", CG_Camera_f },
- { "loaddeferred", CG_LoadDeferredPlayers },
- { "clients", CG_PrintClientNumbers }
+ { "loaddeferred", CG_LoadDeferredPlayers }
};
diff -rupN code-svn//cgame/cg_draw.c code//cgame/cg_draw.c
--- code-svn//cgame/cg_draw.c 2010-05-06 12:48:17.000000000 +0200
+++ code//cgame/cg_draw.c 2009-11-15 01:58:45.000000000 +0100
@@ -209,7 +209,7 @@ Draws large numbers for status bar and p
==============
*/
#ifndef MISSIONPACK
-static void CG_DrawField (int x, int y, int width, int value) {
+static void CG_DrawField (int x, int y, int width, int value, float size) {
char num[16], *ptr;
int l;
int frame;
@@ -246,7 +246,7 @@ static void CG_DrawField (int x, int y,
l = strlen(num);
if (l > width)
l = width;
- x += 2 + CHAR_WIDTH*(width - l);
+ x += 2 + CHAR_WIDTH*size*(width - l);
ptr = num;
while (*ptr && l)
@@ -256,8 +256,8 @@ static void CG_DrawField (int x, int y,
else
frame = *ptr -'0';
- CG_DrawPic( x,y, CHAR_WIDTH, CHAR_HEIGHT, cgs.media.numberShaders[frame] );
- x += CHAR_WIDTH;
+ CG_DrawPic( x,y, CHAR_WIDTH*size, CHAR_HEIGHT*size, cgs.media.numberShaders[frame] );
+ x += CHAR_WIDTH*size;
ptr++;
l--;
}
@@ -560,59 +560,16 @@ static void CG_DrawStatusBar( void ) {
}
// draw the team background
- if ( !(cg.snap->ps.pm_flags & PMF_FOLLOW) ) //If not following anybody:
+ /**if ( !(cg.snap->ps.pm_flags & PMF_FOLLOW) ) //If not following anybody:
CG_DrawTeamBackground( 0, 420, 640, 60, 0.33f, cg.snap->ps.persistant[PERS_TEAM] );
else //Sago: If we follow find the teamcolor of the guy we follow. It might not be our own team!
CG_DrawTeamBackground( 0, 420, 640, 60, 0.33f, cgs.clientinfo[ cg.snap->ps.clientNum ].team );
-
+ **/
cent = &cg_entities[cg.snap->ps.clientNum];
ps = &cg.snap->ps;
VectorClear( angles );
- // draw any 3D icons first, so the changes back to 2D are minimized
- if ( cent->currentState.weapon && cg_weapons[ cent->currentState.weapon ].ammoModel ) {
- origin[0] = 70;
- origin[1] = 0;
- origin[2] = 0;
- angles[YAW] = 90 + 20 * sin( cg.time / 1000.0 );
- CG_Draw3DModel( CHAR_WIDTH*3 + TEXT_ICON_SPACE, 432, ICON_SIZE, ICON_SIZE,
- cg_weapons[ cent->currentState.weapon ].ammoModel, 0, origin, angles );
- }
-
- CG_DrawStatusBarHead( 185 + CHAR_WIDTH*3 + TEXT_ICON_SPACE );
-
- if( cg.predictedPlayerState.powerups[PW_REDFLAG] ) {
- CG_DrawStatusBarFlag( 185 + CHAR_WIDTH*3 + TEXT_ICON_SPACE + ICON_SIZE, TEAM_RED );
- } else if( cg.predictedPlayerState.powerups[PW_BLUEFLAG] ) {
- CG_DrawStatusBarFlag( 185 + CHAR_WIDTH*3 + TEXT_ICON_SPACE + ICON_SIZE, TEAM_BLUE );
- } else if( cg.predictedPlayerState.powerups[PW_NEUTRALFLAG] ) {
- CG_DrawStatusBarFlag( 185 + CHAR_WIDTH*3 + TEXT_ICON_SPACE + ICON_SIZE, TEAM_FREE );
- }
-
- if ( ps->stats[ STAT_ARMOR ] ) {
- origin[0] = 90;
- origin[1] = 0;
- origin[2] = -10;
- angles[YAW] = ( cg.time & 2047 ) * 360 / 2048.0;
- CG_Draw3DModel( 370 + CHAR_WIDTH*3 + TEXT_ICON_SPACE, 432, ICON_SIZE, ICON_SIZE,
- cgs.media.armorModel, 0, origin, angles );
- }
-
- if( cgs.gametype == GT_HARVESTER ) {
- origin[0] = 90;
- origin[1] = 0;
- origin[2] = -10;
- angles[YAW] = ( cg.time & 2047 ) * 360 / 2048.0;
- if( cg.snap->ps.persistant[PERS_TEAM] == TEAM_BLUE ) {
- handle = cgs.media.redCubeModel;
- } else {
- handle = cgs.media.blueCubeModel;
- }
- CG_Draw3DModel( 470 + CHAR_WIDTH*3 + TEXT_ICON_SPACE, 432, ICON_SIZE, ICON_SIZE, handle, 0, origin, angles );
- }
-
-
//
// ammo
//
@@ -631,25 +588,57 @@ static void CG_DrawStatusBar( void ) {
}
}
trap_R_SetColor( colors[color] );
-
- CG_DrawField (0, 432, 3, value);
+ if( value >= 100 )
+ CG_DrawField (320 - 3*CHAR_WIDTH/4, 452, 3, value, 0.5f);
+ else if( value >= 10 )
+ CG_DrawField (320 - 2*CHAR_WIDTH/4, 452, 2, value, 0.5f);
+ else
+ CG_DrawField (320 - CHAR_WIDTH/4, 452, 1, value, 0.5f);
+
trap_R_SetColor( NULL );
- // if we didn't draw a 3D icon, draw a 2D icon for ammo
- if ( !cg_draw3dIcons.integer && cg_drawIcons.integer ) {
- qhandle_t icon;
-
- icon = cg_weapons[ cg.predictedPlayerState.weapon ].ammoIcon;
- if ( icon ) {
- CG_DrawPic( CHAR_WIDTH*3 + TEXT_ICON_SPACE, 432, ICON_SIZE, ICON_SIZE, icon );
- }
- }
}
+ if ( cent->currentState.weapon && cg_weapons[ cg.predictedPlayerState.weapon ].ammoIcon ) {
+ CG_DrawPic( 320-ICON_SIZE/4, 420, ICON_SIZE/2, ICON_SIZE/2, cg_weapons[ cg.predictedPlayerState.weapon ].ammoIcon );
+ }
+ }
+
+
+
+ if( cg.predictedPlayerState.powerups[PW_REDFLAG] ) {
+ CG_DrawStatusBarFlag( 20, TEAM_RED );
+ } else if( cg.predictedPlayerState.powerups[PW_BLUEFLAG] ) {
+ CG_DrawStatusBarFlag( 20, TEAM_BLUE );
+ } else if( cg.predictedPlayerState.powerups[PW_NEUTRALFLAG] ) {
+ CG_DrawStatusBarFlag( 20, TEAM_FREE );
+ }
+
+ if( cgs.gametype == GT_HARVESTER ) {
+ origin[0] = 90;
+ origin[1] = 0;
+ origin[2] = -10;
+ angles[YAW] = ( cg.time & 2047 ) * 360 / 2048.0;
+ if( cg.snap->ps.persistant[PERS_TEAM] == TEAM_BLUE ) {
+ handle = cgs.media.redCubeModel;
+ } else {
+ handle = cgs.media.blueCubeModel;
+ }
+ CG_Draw3DModel( 470 + CHAR_WIDTH*3 + TEXT_ICON_SPACE, 432, ICON_SIZE, ICON_SIZE, handle, 0, origin, angles );
}
//
// health
//
+
+ //CG_DrawStatusBarHead( 320 - 3*CHAR_WIDTH/4 - 5*TEXT_ICON_SPACE - ICON_SIZE );
+
+ if( cg.snap->ps.persistant[PERS_TEAM] == TEAM_BLUE )
+ CG_DrawPic( 320 - 3*CHAR_WIDTH/4 - 5*TEXT_ICON_SPACE - ICON_SIZE, 432, ICON_SIZE, ICON_SIZE, cgs.media.healthBlue );
+ else if( cg.snap->ps.persistant[PERS_TEAM] == TEAM_RED )
+ CG_DrawPic( 320 - 3*CHAR_WIDTH/4 - 5*TEXT_ICON_SPACE - ICON_SIZE, 432, ICON_SIZE, ICON_SIZE, cgs.media.healthRed );
+ else
+ CG_DrawPic( 320 - 3*CHAR_WIDTH/4 - 5*TEXT_ICON_SPACE - ICON_SIZE, 432, ICON_SIZE, ICON_SIZE, cgs.media.healthYellow );
+
value = ps->stats[STAT_HEALTH];
if ( value > 100 ) {
trap_R_SetColor( colors[3] ); // white
@@ -663,7 +652,7 @@ static void CG_DrawStatusBar( void ) {
}
// stretch the health up when taking damage
- CG_DrawField ( 185, 432, 3, value);
+ CG_DrawField ( 320 - 3*CHAR_WIDTH/2 - 4*TEXT_ICON_SPACE - 3*CHAR_WIDTH - ICON_SIZE, 432, 3, value,1.0f);
CG_ColorForHealth( hcolor );
trap_R_SetColor( hcolor );
@@ -672,16 +661,22 @@ static void CG_DrawStatusBar( void ) {
// armor
//
value = ps->stats[STAT_ARMOR];
- if (value > 0 ) {
- trap_R_SetColor( colors[0] );
- CG_DrawField (370, 432, 3, value);
- trap_R_SetColor( NULL );
- // if we didn't draw a 3D icon, draw a 2D icon for armor
- if ( !cg_draw3dIcons.integer && cg_drawIcons.integer ) {
- CG_DrawPic( 370 + CHAR_WIDTH*3 + TEXT_ICON_SPACE, 432, ICON_SIZE, ICON_SIZE, cgs.media.armorIcon );
- }
+ trap_R_SetColor( colors[0] );
+ if ( value >= 100 )
+ CG_DrawField (320 + CHAR_WIDTH + 6*TEXT_ICON_SPACE + ICON_SIZE, 432, 3, value, 1.0f);
+ else
+ CG_DrawField (320 + CHAR_WIDTH + 6*TEXT_ICON_SPACE + ICON_SIZE, 432, 2, value, 1.0f);
+ trap_R_SetColor( NULL );
+ // if we didn't draw a 3D icon, draw a 2D icon for armor
+ if( cg.snap->ps.persistant[PERS_TEAM] == TEAM_BLUE )
+ CG_DrawPic( 320 + CHAR_WIDTH + 4*TEXT_ICON_SPACE, 432, ICON_SIZE, ICON_SIZE, cgs.media.armorBlue );
+ else if( cg.snap->ps.persistant[PERS_TEAM] == TEAM_RED )
+ CG_DrawPic( 320 + CHAR_WIDTH + 4*TEXT_ICON_SPACE, 432, ICON_SIZE, ICON_SIZE, cgs.media.armorRed );
+ else
+ CG_DrawPic( 320 + CHAR_WIDTH + 4*TEXT_ICON_SPACE, 432, ICON_SIZE, ICON_SIZE, cgs.media.armorYellow );
+
- }
+
//Skulls!
if(cgs.gametype == GT_HARVESTER)
@@ -689,7 +684,7 @@ static void CG_DrawStatusBar( void ) {
value = ps->generic1;
if (value > 0 ) {
trap_R_SetColor( colors[0] );
- CG_DrawField (470, 432, 3, value);
+ CG_DrawField (470, 432, 3, value, 1.0f);
trap_R_SetColor( NULL );
// if we didn't draw a 3D icon, draw a 2D icon for skull
if ( !cg_draw3dIcons.integer && cg_drawIcons.integer ) {
@@ -852,12 +847,12 @@ static float CG_DrawFPS( float y ) {
fps = 1000 * FPS_FRAMES / total;
s = va( "%ifps", fps );
- w = CG_DrawStrlen( s ) * BIGCHAR_WIDTH;
+ w = CG_DrawStrlen( s ) * SMALLCHAR_WIDTH;
- CG_DrawBigString( 635 - w, y + 2, s, 1.0F);
+ CG_DrawSmallString( 635 - w, y + 2, s, 1.0F);
}
- return y + BIGCHAR_HEIGHT + 4;
+ return y + SMALLCHAR_HEIGHT + 4;
}
/*
@@ -865,7 +860,7 @@ static float CG_DrawFPS( float y ) {
CG_DrawTimer
=================
*/
-static float CG_DrawTimer( float y ) {
+void CG_DrawTimer() {
char *s;
int w;
int mins, seconds, tens;
@@ -882,9 +877,9 @@ static float CG_DrawTimer( float y ) {
s = va( "%i:%i%i", mins, tens, seconds );
w = CG_DrawStrlen( s ) * BIGCHAR_WIDTH;
- CG_DrawBigString( 635 - w, y + 2, s, 1.0F);
+ CG_DrawBigString( 320 - w/2, 10, s, 1.0F);
- return y + BIGCHAR_HEIGHT + 4;
+ return;
}
/*
@@ -1076,15 +1071,9 @@ static float CG_DrawEliminationTimer( fl
float scale;
int cw;
int rst;
-
-
-
+
rst = cgs.roundStartTime;
- if(cg.time>rst && !cgs.roundtime) {
- return y;
- }
-
//default color is white
memcpy(color,g_color_table[ColorIndex(COLOR_WHITE)],sizeof(color));
@@ -1151,9 +1140,8 @@ Lots of stuff
//w = CG_Text_Width(s, scale, 0);
//CG_Text_Paint(320 - w / 2, 125, scale, colorWhite, st, 0, 0, ITEM_TEXTSTYLE_SHADOWEDMORE);
#else
-
- w = CG_DrawStrlen( st );
- CG_DrawStringExt( 320 - w * cw/2, 70, st, colorWhite,
+ w = CG_DrawStrlen( st );
+ CG_DrawStringExt( 320 - w * cw/2, 70, st, colorWhite,
qfalse, qtrue, cw, (int)(cw * 1.5), 0 );
#endif
}
@@ -1414,9 +1402,6 @@ static void CG_DrawUpperRight(stereoFram
y = CG_DrawFollowMessage( y );
- if ( cg_drawTimer.integer) {
- y = CG_DrawTimer( y );
- }
if ( cg_drawAttacker.integer ) {
y = CG_DrawAttacker( y );
}
@@ -1697,7 +1682,7 @@ static float CG_DrawPowerups( float y )
y -= ICON_SIZE;
trap_R_SetColor( colors[color] );
- CG_DrawField( x, y, 2, sortedTime[ i ] / 1000 );
+ CG_DrawField( x, y, 2, sortedTime[ i ] / 1000 , 1.0f);
t = ps->powerups[ sorted[i] ];
if ( t - cg.time >= POWERUP_BLINKS * POWERUP_BLINK_TIME ) {
@@ -1818,8 +1803,8 @@ static void CG_DrawTeamInfo( void ) {
vec4_t hcolor;
int chatHeight;
-#define CHATLOC_Y 420 // bottom end
-#define CHATLOC_X 0
+#define TEAMCHATLOC_Y 420 // bottom end
+#define TEAMCHATLOC_X 0
if (cg_teamChatHeight.integer < TEAMCHAT_HEIGHT)
chatHeight = cg_teamChatHeight.integer;
@@ -1863,15 +1848,15 @@ static void CG_DrawTeamInfo( void ) {
}
trap_R_SetColor( hcolor );
- CG_DrawPic( CHATLOC_X, CHATLOC_Y - h, 640, h, cgs.media.teamStatusBar );
+ CG_DrawPic( TEAMCHATLOC_X, TEAMCHATLOC_Y - h, 640, h, cgs.media.teamStatusBar );
trap_R_SetColor( NULL );
hcolor[0] = hcolor[1] = hcolor[2] = 1.0f;
hcolor[3] = 1.0f;
for (i = cgs.teamChatPos - 1; i >= cgs.teamLastChatPos; i--) {
- CG_DrawStringExt( CHATLOC_X + TINYCHAR_WIDTH,
- CHATLOC_Y - (cgs.teamChatPos - i)*TINYCHAR_HEIGHT,
+ CG_DrawStringExt( TEAMCHATLOC_X + TINYCHAR_WIDTH,
+ TEAMCHATLOC_Y - (cgs.teamChatPos - i)*TINYCHAR_HEIGHT,
cgs.teamChatMsgs[i % chatHeight], hcolor, qfalse, qfalse,
TINYCHAR_WIDTH, TINYCHAR_HEIGHT, 0 );
}
@@ -1880,6 +1865,125 @@ static void CG_DrawTeamInfo( void ) {
#endif // MISSIONPACK
/*
+=================
+CG_DrawChat
+=================
+*/
+static void CG_DrawChat(void)
+{
+ int w, h;
+ int i, len;
+ vec4_t hcolor;
+ int chatHeight;
+
+#define CHATLOC_Y 60
+#define CHATLOC_X 0
+
+ if (cg_chatHeight.integer < TEAMCHAT_HEIGHT)
+ chatHeight = cg_chatHeight.integer;
+ else
+ chatHeight = TEAMCHAT_HEIGHT;
+ if (chatHeight <= 0)
+ return; // disabled
+
+ if (cgs.lastChatPos != cgs.chatPos)
+ {
+ if (cg.time - cgs.chatMsgTimes[cgs.lastChatPos % chatHeight] >
+ cg_chatTime.integer)
+ {
+ cgs.lastChatPos++;
+ }
+
+ h = (cgs.chatPos - cgs.lastChatPos) * TINYCHAR_HEIGHT;
+
+ w = 0;
+
+ for (i = cgs.lastChatPos; i < cgs.chatPos; i++)
+ {
+ len = CG_DrawStrlen(cgs.chatMsgs[i % chatHeight]);
+ if (len > w)
+ w = len;
+ }
+ w *= TINYCHAR_WIDTH;
+ w += TINYCHAR_WIDTH * 2;
+
+ hcolor[0] = hcolor[1] = hcolor[2] = 1.0f;
+ hcolor[3] = 1.0f;
+
+ for (i = cgs.lastChatPos; i < cgs.chatPos; i++)
+ {
+ CG_DrawStringExt(CHATLOC_X,
+ CHATLOC_Y + (i - cgs.lastChatPos ) * TINYCHAR_HEIGHT,
+ cgs.chatMsgs[i % chatHeight], hcolor, qfalse,
+ qfalse, TINYCHAR_WIDTH, TINYCHAR_HEIGHT, 0);
+ }
+ }
+}
+
+/*
+=================
+CG_DrawDeathNotice
+=================
+*/
+
+static void CG_DrawDeathNotice(void){
+ int i;
+ int x;
+ int y;
+ vec4_t color1,color2;
+ qboolean setcolor1, setcolor2;
+ y=0;
+ for( i = DEATHNOTICE_HEIGHT - 1; i >= 0 ; i-- ) {
+ if( ( cgs.deathNoticeTime[ i ] != 0 ) && ( cg.time - cgs.deathNoticeTime[ i ] < cg_deathNoticeTime.integer ) ) {
+
+ if( cgs.deathNoticeTeam1[ i ] == TEAM_RED ){
+ color1[0]=color1[3]=1.0F;
+ color1[1]=color1[2]=0.2f;
+ setcolor1 = qtrue;
+ } else if ( cgs.deathNoticeTeam1[ i ] == TEAM_BLUE ) {
+ color1[2]=color1[3]=1.0F;
+ color1[1]=color1[0]=0.2f;
+ setcolor1 = qtrue;
+ } else {
+ color1[0]=color1[1]=color1[2]=color1[3]=1.0F;
+ setcolor1 = qfalse;
+ }
+
+ if( cgs.deathNoticeTeam2[ i ] == TEAM_RED ){
+ color2[0]=color2[3]=1.0F;
+ color2[1]=color2[2]=0.2f;
+ setcolor2 = qtrue;
+ } else if ( cgs.deathNoticeTeam2[ i ] == TEAM_BLUE ) {
+ color2[2]=color2[3]=1.0F;
+ color2[1]=color2[0]=0.2f;
+ setcolor2 = qtrue;
+ } else {
+ color2[0]=color2[1]=color2[2]=color2[3]=1.0F;
+ setcolor2 = qfalse;
+ }
+
+ x = 0;
+ CG_DrawStringExt(x,y, cgs.deathNoticeName1[ i ], color1, setcolor1, qfalse, TINYCHAR_WIDTH, TINYCHAR_HEIGHT, 0);
+
+ x += TINYCHAR_WIDTH*( CG_DrawStrlen(cgs.deathNoticeName1[ i ]));
+
+ if( cgs.deathNoticeTwoIcons[ i ] ) {
+ CG_DrawPic(x + 1, y, 8, 8, cgs.deathNoticeIcon2[ i ]);
+ x += 10;
+ }
+
+ CG_DrawPic(x + 1, y, 8, 8, cgs.deathNoticeIcon1[ i ]);
+
+ x += 10;
+
+ CG_DrawStringExt(x, y, cgs.deathNoticeName2[ i ], color2, setcolor2, qfalse, TINYCHAR_WIDTH, TINYCHAR_HEIGHT, 0);
+
+ y += TINYCHAR_HEIGHT + 2;
+ }
+ }
+}
+
+/*
===================
CG_DrawHoldableItem
===================
@@ -2416,9 +2520,6 @@ static void CG_DrawCenterDDString( void
case 3:
trap_S_StartLocalSound( cgs.media.count3Sound, CHAN_ANNOUNCER );
break;
- case 10:
- trap_S_StartLocalSound( cgs.media.doublerSound , CHAN_ANNOUNCER );
- break;
default:
break;
}
@@ -3262,6 +3363,8 @@ static void CG_Draw2D(stereoFrame_t ster
#endif
}
}
+ CG_DrawDeathNotice();
+ CG_DrawChat();
CG_DrawVote();
CG_DrawTeamVote();
@@ -3271,9 +3374,15 @@ static void CG_Draw2D(stereoFrame_t ster
#ifdef MISSIONPACK
if (!cg_paused.integer) {
CG_DrawUpperRight(stereoFrame);
+ if ( cg_drawTimer.integer) {
+ CG_DrawTimer();
+ }
}
#else
CG_DrawUpperRight(stereoFrame);
+ if ( cg_drawTimer.integer) {
+ CG_DrawTimer();
+ }
#endif
#ifndef MISSIONPACK
diff -rupN code-svn//cgame/cg_effects.c code//cgame/cg_effects.c
--- code-svn//cgame/cg_effects.c 2009-12-03 13:43:07.000000000 +0100
+++ code//cgame/cg_effects.c 2009-11-14 15:55:49.000000000 +0100
@@ -514,85 +514,39 @@ void CG_Bleed( vec3_t origin, int entity
ex->refEntity.renderfx |= RF_THIRD_PERSON;
}
}
-
+
/*
==================
-CG_SpurtBlood (LEILEI)
+CG_LaunchGib
==================
*/
-void CG_SpurtBlood( vec3_t origin, vec3_t velocity, int hard ) {
- localEntity_t *le;
- refEntity_t *re;
- localEntity_t *blood;
-// if ( !cg_blood.integer ) { return; }
-
-
- velocity[0] = velocity[0] * hard * crandom()*460;
- velocity[1] = velocity[1] * hard * crandom()*460;
- velocity[2] = velocity[2] * hard * crandom()*566 + 65;
- blood = CG_SmokePuff( origin, velocity,
- 21, // radius
- 1, 1, 1, 1, // color
- 2450, // trailTime
- cg.time, // startTime
- 0, // fadeInTime
- 0, // flags
- cgs.media.lbldShader1 );
- // use the optimized version
- blood->leType = LE_FALL_SCALE_FADE;
- blood->leType = LE_GORE;
- blood->pos.trType = TR_GRAVITY;
- VectorCopy( velocity, blood->pos.trDelta );
- blood->pos.trDelta[2] = 55;
- if (crandom() < 0.5){
- blood->leMarkType = LEMT_BURN;
- blood->leBounceSoundType = LEBS_BLOOD;
- }
- // VectorCopy( velocity, blood->pos.trDelta );
-
-}
-/*
-==================
-CG_LaunchGib
-==================
-*/
-void CG_LaunchGib( vec3_t origin, vec3_t velocity, qhandle_t hModel ) {
- localEntity_t *le;
- refEntity_t *re;
-
- le = CG_AllocLocalEntity();
- re = &le->refEntity;
-
- le->leType = LE_FRAGMENT;
- le->startTime = cg.time;
- le->endTime = le->startTime + 5000 + random() * 3000;
-
- VectorCopy( origin, re->origin );
- AxisCopy( axisDefault, re->axis );
- re->hModel = hModel;
-
- le->pos.trType = TR_GRAVITY;
- VectorCopy( origin, le->pos.trBase );
- VectorCopy( velocity, le->pos.trDelta );
- le->pos.trTime = cg.time;
-
- le->bounceFactor = 0.6f;
-
- le->leBounceSoundType = LEBS_BLOOD;
- le->leMarkType = LEMT_BLOOD;
- if ( cg_leiSuperGoreyAwesome.integer ) {
- CG_SpurtBlood( origin, velocity, 7); // LEILEI toss some extra juice
- CG_SpurtBlood( origin, velocity, 22);
- CG_SpurtBlood( origin, velocity, 11);
- }
-
-}
-
-
-
-
+void CG_LaunchGib( vec3_t origin, vec3_t velocity, qhandle_t hModel ) {
+ localEntity_t *le;
+ refEntity_t *re;
+
+ le = CG_AllocLocalEntity();
+ re = &le->refEntity;
+
+ le->leType = LE_FRAGMENT;
+ le->startTime = cg.time;
+ le->endTime = le->startTime + 5000 + random() * 3000;
+
+ VectorCopy( origin, re->origin );
+ AxisCopy( axisDefault, re->axis );
+ re->hModel = hModel;
+
+ le->pos.trType = TR_GRAVITY;
+ VectorCopy( origin, le->pos.trBase );
+ VectorCopy( velocity, le->pos.trDelta );
+ le->pos.trTime = cg.time;
+
+ le->bounceFactor = 0.6f;
+
+ le->leBounceSoundType = LEBS_BLOOD;
+ le->leMarkType = LEMT_BLOOD;
+}
/*
===================
@@ -720,7 +674,7 @@ CG_GibPlayer
Generated a bunch of gibs launching out from the bodies location
===================
*/
-void CG_BigExplosion( vec3_t playerOrigin ) {
+void CG_BigExplode( vec3_t playerOrigin ) {
vec3_t origin, velocity;
if ( !cg_blood.integer ) {
@@ -758,7 +712,3 @@ void CG_BigExplosion( vec3_t playerOrigi
CG_LaunchExplode( origin, velocity, cgs.media.smoke2 );
}
-
-
-
-
diff -rupN code-svn//cgame/cg_event.c code//cgame/cg_event.c
--- code-svn//cgame/cg_event.c 2009-12-03 13:43:07.000000000 +0100
+++ code//cgame/cg_event.c 2009-11-15 02:12:19.000000000 +0100
@@ -90,6 +90,11 @@ static void CG_Obituary( entityState_t *
char attackerName[32];
gender_t gender;