Changeset 24
- Timestamp:
- Sep 28, 2011, 9:14:55 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Forms/UMainForm.lfm
r23 r24 51 51 Width = 514 52 52 Align = alClient 53 OnMouseLeave = Image1MouseLeave 53 54 OnResize = Image1Resize 54 55 end -
trunk/Forms/UMainForm.pas
r23 r24 48 48 procedure FormKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState); 49 49 procedure FormShow(Sender: TObject); 50 procedure Image1MouseLeave(Sender: TObject); 50 51 procedure Image1Resize(Sender: TObject); 51 52 procedure TimerDrawTimer(Sender: TObject); … … 201 202 end; 202 203 204 procedure TMainForm.Image1MouseLeave(Sender: TObject); 205 begin 206 207 end; 208 203 209 procedure TMainForm.Image1Resize(Sender: TObject); 204 210 begin -
trunk/Forms/UMapForm.pas
r21 r24 30 30 31 31 uses 32 UCore ;32 UCore, UMainForm; 33 33 34 34 { TMapForm } … … 37 37 begin 38 38 Image1.Picture.Bitmap.SetSize(Image1.Width, Image1.Height); 39 Engine.World.DrawToBitmap(Image1.Picture.Bitmap);39 MainForm.Engine.World.DrawToBitmap(Image1.Picture.Bitmap); 40 40 end; 41 41 -
trunk/Forms/UNewGameForm.pas
r23 r24 34 34 35 35 uses 36 UCore ;36 UCore, UMainForm; 37 37 38 38 {$R *.lfm} … … 60 60 BeginUpdate; 61 61 Clear; 62 for I := 0 to Engine.PlayerPool.Count - 1 do63 with TPlayer( Engine.PlayerPool[I]) do begin62 for I := 0 to MainForm.Engine.PlayerPool.Count - 1 do 63 with TPlayer(MainForm.Engine.PlayerPool[I]) do begin 64 64 NewItem := Items.Add; 65 65 NewItem.Caption := Name; -
trunk/UApplicationInfo.pas
r18 r24 52 52 Name := 'Tunneler'; 53 53 Identification := 1; 54 ReleaseDate := '2011-0 3-24';54 ReleaseDate := '2011-09-28'; 55 55 MajorVersion := 0; 56 MinorVersion := 1;56 MinorVersion := 2; 57 57 BugFixVersion := 0; 58 58 CompanyName := 'Chronosoft'; -
trunk/UCore.pas
r23 r24 204 204 (X: 0; Y: 1), (X: -1; Y: 1), (X: -1; Y: 0), (X: -1; Y: -1)); 205 205 206 var207 Engine: TEngine;208 209 206 function SwapBRComponent(Value: Integer): Integer; inline; 210 207 … … 427 424 Color := TColor($b600b6); 428 425 Player := 3; 426 end; 427 428 // Player 5 cannon 429 with TMatter(Matter.AddNew(TMatter.Create)) do begin 430 Kind := mkCannon; 431 Color := clYellow; 432 Player := 4; 433 end; 434 // Player 5 home 435 with TMatter(Matter.AddNew(TMatter.Create)) do begin 436 Kind := mkHome; 437 Color := TColor($ffff2c); 438 Player := 4; 439 end; 440 // Player 5 body1 441 with TMatter(Matter.AddNew(TMatter.Create)) do begin 442 Kind := mkTankBody; 443 Color := TColor($ffff2c); 444 Player := 4; 445 end; 446 // Player 5 body2 447 with TMatter(Matter.AddNew(TMatter.Create)) do begin 448 Kind := mkTankBody; 449 Color := TColor($b6b600); 450 Player := 4; 451 end; 452 453 // Player 6 cannon 454 with TMatter(Matter.AddNew(TMatter.Create)) do begin 455 Kind := mkCannon; 456 Color := clYellow; 457 Player := 5; 458 end; 459 // Player 6 home 460 with TMatter(Matter.AddNew(TMatter.Create)) do begin 461 Kind := mkHome; 462 Color := TColor($2cffff); 463 Player := 5; 464 end; 465 // Player 6 body1 466 with TMatter(Matter.AddNew(TMatter.Create)) do begin 467 Kind := mkTankBody; 468 Color := TColor($2cffff); 469 Player := 5; 470 end; 471 // Player 6 body2 472 with TMatter(Matter.AddNew(TMatter.Create)) do begin 473 Kind := mkTankBody; 474 Color := TColor($00b6b6); 475 Player := 5; 476 end; 477 478 // Player 7 cannon 479 with TMatter(Matter.AddNew(TMatter.Create)) do begin 480 Kind := mkCannon; 481 Color := clYellow; 482 Player := 6; 483 end; 484 // Player 7 home 485 with TMatter(Matter.AddNew(TMatter.Create)) do begin 486 Kind := mkHome; 487 Color := TColor($008cff); 488 Player := 6; 489 end; 490 // Player 7 body1 491 with TMatter(Matter.AddNew(TMatter.Create)) do begin 492 Kind := mkTankBody; 493 Color := TColor($008cff); 494 Player := 6; 495 end; 496 // Player 7 body2 497 with TMatter(Matter.AddNew(TMatter.Create)) do begin 498 Kind := mkTankBody; 499 Color := TColor($002da0); 500 Player := 6; 501 end; 502 503 // Player 8 cannon 504 with TMatter(Matter.AddNew(TMatter.Create)) do begin 505 Kind := mkCannon; 506 Color := clYellow; 507 Player := 7; 508 end; 509 // Player 8 home 510 with TMatter(Matter.AddNew(TMatter.Create)) do begin 511 Kind := mkHome; 512 Color := TColor($d0d0d0); 513 Player := 7; 514 end; 515 // Player 8 body1 516 with TMatter(Matter.AddNew(TMatter.Create)) do begin 517 Kind := mkTankBody; 518 Color := TColor($d0d0d0); 519 Player := 7; 520 end; 521 // Player 8 body2 522 with TMatter(Matter.AddNew(TMatter.Create)) do begin 523 Kind := mkTankBody; 524 Color := TColor($707070); 525 Player := 7; 429 526 end; 430 527 end; … … 666 763 for P := 0 to Engine.Players.Count - 1 do 667 764 with TPlayer(Engine.Players[P]) do 668 if Enabled and (TMatter(Engine.World.Matter[ItemsXY[Pos.X, Pos.Y]]).Kind = mkTankBody) then 765 if (TMatter(Engine.World.Matter[ItemsXY[Pos.X, Pos.Y]]).Kind = mkTankBody) and 766 (TMatter(Engine.World.Matter[ItemsXY[Pos.X, Pos.Y]]).Player = P) then 669 767 Shield := Shield - 1 / ShieldSteps; 670 768 if StopByDirt then Explosion(LastPos, BulletExplosionRange); … … 1111 1209 with TPlayer(PlayerPool.AddNew(TPlayer.Create)) do begin 1112 1210 Keys.Left := 76; 1113 Keys.Down := 1 86;1211 Keys.Down := 147; 1114 1212 Keys.Right := 222; 1115 1213 Keys.Up := 80; … … 1123 1221 Keys.Shoot := 105; 1124 1222 end; 1223 with TPlayer(PlayerPool.AddNew(TPlayer.Create)) do begin 1224 Keys.Left := 0; 1225 Keys.Down := 0; 1226 Keys.Right := 0; 1227 Keys.Up := 0; 1228 Keys.Shoot := 0; 1229 end; 1230 with TPlayer(PlayerPool.AddNew(TPlayer.Create)) do begin 1231 Keys.Left := 0; 1232 Keys.Down := 0; 1233 Keys.Right := 0; 1234 Keys.Up := 0; 1235 Keys.Shoot := 0; 1236 end; 1237 with TPlayer(PlayerPool.AddNew(TPlayer.Create)) do begin 1238 Keys.Left := 0; 1239 Keys.Down := 0; 1240 Keys.Right := 0; 1241 Keys.Up := 0; 1242 Keys.Shoot := 0; 1243 end; 1244 with TPlayer(PlayerPool.AddNew(TPlayer.Create)) do begin 1245 Keys.Left := 0; 1246 Keys.Down := 0; 1247 Keys.Right := 0; 1248 Keys.Up := 0; 1249 Keys.Shoot := 0; 1250 end; 1125 1251 for I := 0 to PlayerPool.Count - 1 do 1126 1252 with TPlayer(PlayerPool[I]) do begin … … 1129 1255 InitTanks; 1130 1256 Name := SPlayer + ' ' + IntToStr(I + 1); 1257 Enabled := True; 1131 1258 end; 1132 1259 end; … … 1230 1357 I2: Integer; 1231 1358 begin 1359 Active := False; 1232 1360 Players.Clear; 1233 1361 for I := 0 to PlayerPool.Count - 1 do … … 1242 1370 with TPlayer(Players[I]) do 1243 1371 Init; 1372 ClearBackground := True; 1244 1373 Redraw; 1374 Active := True; 1245 1375 end; 1246 1376 -
trunk/tunneler.lpi
r23 r24 55 55 <TopLine Value="1"/> 56 56 <CursorPos X="61" Y="10"/> 57 <UsageCount Value="11 4"/>57 <UsageCount Value="116"/> 58 58 <Loaded Value="True"/> 59 59 </Unit0> … … 72 72 <IsPartOfProject Value="True"/> 73 73 <UnitName Value="UCore"/> 74 <IsVisibleTab Value="True"/>75 74 <EditorIndex Value="0"/> 76 75 <WindowIndex Value="0"/> 77 <TopLine Value=" 954"/>78 <CursorPos X=" 9" Y="970"/>79 <UsageCount Value="11 4"/>76 <TopLine Value="739"/> 77 <CursorPos X="14" Y="766"/> 78 <UsageCount Value="116"/> 80 79 <Loaded Value="True"/> 81 80 </Unit2> … … 125 124 <TopLine Value="453"/> 126 125 <CursorPos X="1" Y="470"/> 127 <UsageCount Value="1 0"/>126 <UsageCount Value="11"/> 128 127 <Loaded Value="True"/> 129 128 </Unit8> … … 147 146 <EditorIndex Value="16"/> 148 147 <WindowIndex Value="0"/> 149 <TopLine Value="15 4"/>150 <CursorPos X=" 3" Y="156"/>148 <TopLine Value="152"/> 149 <CursorPos X="1" Y="174"/> 151 150 <UsageCount Value="49"/> 152 151 <Loaded Value="True"/> … … 181 180 <TopLine Value="115"/> 182 181 <CursorPos X="1" Y="132"/> 183 <UsageCount Value="2 6"/>182 <UsageCount Value="27"/> 184 183 <Loaded Value="True"/> 185 184 </Unit15> … … 401 400 <IsPartOfProject Value="True"/> 402 401 <UnitName Value="UPlatform"/> 403 <UsageCount Value="7 3"/>402 <UsageCount Value="75"/> 404 403 </Unit44> 405 404 <Unit45> … … 450 449 <TopLine Value="120"/> 451 450 <CursorPos X="44" Y="150"/> 452 <UsageCount Value=" 58"/>451 <UsageCount Value="60"/> 453 452 <Loaded Value="True"/> 454 453 </Unit50> … … 476 475 <TopLine Value="69"/> 477 476 <CursorPos X="3" Y="90"/> 478 <UsageCount Value="5 1"/>477 <UsageCount Value="53"/> 479 478 <Loaded Value="True"/> 480 479 </Unit53> … … 483 482 <IsPartOfProject Value="True"/> 484 483 <UnitName Value="UApplicationInfo"/> 484 <IsVisibleTab Value="True"/> 485 485 <EditorIndex Value="18"/> 486 486 <WindowIndex Value="0"/> 487 <TopLine Value=" 1"/>488 <CursorPos X=" 70" Y="42"/>489 <UsageCount Value="5 1"/>487 <TopLine Value="29"/> 488 <CursorPos X="20" Y="56"/> 489 <UsageCount Value="53"/> 490 490 <Loaded Value="True"/> 491 491 </Unit54> … … 494 494 <IsPartOfProject Value="True"/> 495 495 <UnitName Value="URegistry"/> 496 <UsageCount Value="5 0"/>496 <UsageCount Value="52"/> 497 497 </Unit55> 498 498 <Unit56> … … 525 525 <TopLine Value="34"/> 526 526 <CursorPos X="35" Y="51"/> 527 <UsageCount Value="4 2"/>527 <UsageCount Value="44"/> 528 528 <Loaded Value="True"/> 529 529 </Unit59> … … 546 546 <EditorIndex Value="3"/> 547 547 <WindowIndex Value="0"/> 548 <TopLine Value="4 1"/>549 <CursorPos X=" 1" Y="74"/>550 <UsageCount Value="4 2"/>548 <TopLine Value="44"/> 549 <CursorPos X="23" Y="65"/> 550 <UsageCount Value="44"/> 551 551 <Loaded Value="True"/> 552 552 <LoadedDesigner Value="True"/> … … 561 561 <EditorIndex Value="4"/> 562 562 <WindowIndex Value="0"/> 563 <TopLine Value=" 29"/>564 <CursorPos X=" 1" Y="46"/>565 <UsageCount Value="4 2"/>563 <TopLine Value="183"/> 564 <CursorPos X="3" Y="206"/> 565 <UsageCount Value="44"/> 566 566 <Loaded Value="True"/> 567 567 <LoadedDesigner Value="True"/> … … 576 576 <EditorIndex Value="20"/> 577 577 <WindowIndex Value="0"/> 578 <TopLine Value="1 "/>579 <CursorPos X="1 0" Y="5"/>580 <UsageCount Value="4 2"/>578 <TopLine Value="14"/> 579 <CursorPos X="19" Y="32"/> 580 <UsageCount Value="44"/> 581 581 <Loaded Value="True"/> 582 582 <LoadedDesigner Value="True"/> … … 616 616 <TopLine Value="1508"/> 617 617 <CursorPos X="17" Y="1512"/> 618 <UsageCount Value="1 0"/>618 <UsageCount Value="11"/> 619 619 <Loaded Value="True"/> 620 620 </Unit67> … … 625 625 <TopLine Value="1"/> 626 626 <CursorPos X="33" Y="15"/> 627 <UsageCount Value="1 0"/>627 <UsageCount Value="11"/> 628 628 <Loaded Value="True"/> 629 629 </Unit68> … … 634 634 <TopLine Value="50"/> 635 635 <CursorPos X="5" Y="67"/> 636 <UsageCount Value="1 0"/>636 <UsageCount Value="11"/> 637 637 <Loaded Value="True"/> 638 638 </Unit69> … … 643 643 <TopLine Value="164"/> 644 644 <CursorPos X="27" Y="167"/> 645 <UsageCount Value="1 0"/>645 <UsageCount Value="11"/> 646 646 <Loaded Value="True"/> 647 647 </Unit70> … … 649 649 <JumpHistory Count="30" HistoryIndex="29"> 650 650 <Position1> 651 <Filename Value=" Common/UThreading.pas"/>652 <Caret Line=" 272" Column="11" TopLine="255"/>651 <Filename Value="UCore.pas"/> 652 <Caret Line="1264" Column="1" TopLine="1240"/> 653 653 </Position1> 654 654 <Position2> 655 655 <Filename Value="UCore.pas"/> 656 <Caret Line=" 241" Column="14" TopLine="238"/>656 <Caret Line="1266" Column="1" TopLine="1240"/> 657 657 </Position2> 658 658 <Position3> 659 659 <Filename Value="UCore.pas"/> 660 <Caret Line="12 21" Column="9" TopLine="1205"/>660 <Caret Line="1267" Column="1" TopLine="1240"/> 661 661 </Position3> 662 662 <Position4> 663 <Filename Value=" Common/UThreading.pas"/>664 <Caret Line="1 67" Column="19" TopLine="158"/>663 <Filename Value="UCore.pas"/> 664 <Caret Line="1268" Column="1" TopLine="1240"/> 665 665 </Position4> 666 666 <Position5> 667 667 <Filename Value="UCore.pas"/> 668 <Caret Line=" 972" Column="57" TopLine="955"/>668 <Caret Line="803" Column="1" TopLine="786"/> 669 669 </Position5> 670 670 <Position6> 671 671 <Filename Value="UCore.pas"/> 672 <Caret Line=" 16" Column="41" TopLine="1"/>672 <Caret Line="805" Column="1" TopLine="786"/> 673 673 </Position6> 674 674 <Position7> 675 <Filename Value=" Common/UThreading.pas"/>676 <Caret Line=" 272" Column="5" TopLine="255"/>675 <Filename Value="UCore.pas"/> 676 <Caret Line="806" Column="1" TopLine="786"/> 677 677 </Position7> 678 678 <Position8> 679 <Filename Value=" Common/UThreading.pas"/>680 <Caret Line=" 274" Column="54" TopLine="255"/>679 <Filename Value="UCore.pas"/> 680 <Caret Line="807" Column="1" TopLine="786"/> 681 681 </Position8> 682 682 <Position9> 683 683 <Filename Value="UCore.pas"/> 684 <Caret Line=" 972" Column="31" TopLine="957"/>684 <Caret Line="808" Column="1" TopLine="786"/> 685 685 </Position9> 686 686 <Position10> 687 <Filename Value=" Common/UThreading.pas"/>688 <Caret Line=" 43" Column="48" TopLine="26"/>687 <Filename Value="UCore.pas"/> 688 <Caret Line="809" Column="1" TopLine="786"/> 689 689 </Position10> 690 690 <Position11> 691 691 <Filename Value="UCore.pas"/> 692 <Caret Line=" 960" Column="29" TopLine="947"/>692 <Caret Line="810" Column="1" TopLine="786"/> 693 693 </Position11> 694 694 <Position12> 695 695 <Filename Value="UCore.pas"/> 696 <Caret Line=" 241" Column="14" TopLine="238"/>696 <Caret Line="811" Column="1" TopLine="786"/> 697 697 </Position12> 698 698 <Position13> 699 <Filename Value=" Common/UThreading.pas"/>700 <Caret Line=" 61" Column="31" TopLine="53"/>699 <Filename Value="UCore.pas"/> 700 <Caret Line="789" Column="1" TopLine="783"/> 701 701 </Position13> 702 702 <Position14> 703 <Filename Value=" Common/UThreading.pas"/>704 <Caret Line=" 51" Column="33" TopLine="41"/>703 <Filename Value="UCore.pas"/> 704 <Caret Line="790" Column="1" TopLine="783"/> 705 705 </Position14> 706 706 <Position15> 707 707 <Filename Value="UCore.pas"/> 708 <Caret Line=" 1205" Column="23" TopLine="1205"/>708 <Caret Line="792" Column="1" TopLine="783"/> 709 709 </Position15> 710 710 <Position16> 711 711 <Filename Value="UCore.pas"/> 712 <Caret Line=" 204" Column="32" TopLine="191"/>712 <Caret Line="791" Column="1" TopLine="783"/> 713 713 </Position16> 714 714 <Position17> 715 <Filename Value=" Common/UThreading.pas"/>716 <Caret Line=" 61" Column="26" TopLine="43"/>715 <Filename Value="UCore.pas"/> 716 <Caret Line="794" Column="1" TopLine="783"/> 717 717 </Position17> 718 718 <Position18> 719 <Filename Value=" Common/UThreading.pas"/>720 <Caret Line=" 51" Column="35" TopLine="34"/>719 <Filename Value="UCore.pas"/> 720 <Caret Line="812" Column="1" TopLine="784"/> 721 721 </Position18> 722 722 <Position19> 723 <Filename Value=" /usr/share/fpcsrc/2.4.2/rtl/unix/tthread.inc"/>724 <Caret Line=" 6" Column="64" TopLine="1"/>723 <Filename Value="UCore.pas"/> 724 <Caret Line="1267" Column="1" TopLine="1240"/> 725 725 </Position19> 726 726 <Position20> 727 727 <Filename Value="UCore.pas"/> 728 <Caret Line=" 971" Column="35" TopLine="955"/>728 <Caret Line="1268" Column="1" TopLine="1240"/> 729 729 </Position20> 730 730 <Position21> 731 <Filename Value=" ../../../lazarus/lcl/include/rasterimage.inc"/>732 <Caret Line=" 470" Column="1" TopLine="453"/>731 <Filename Value="UCore.pas"/> 732 <Caret Line="1269" Column="1" TopLine="1240"/> 733 733 </Position21> 734 734 <Position22> 735 735 <Filename Value="UCore.pas"/> 736 <Caret Line=" 966" Column="65" TopLine="955"/>736 <Caret Line="1262" Column="1" TopLine="1240"/> 737 737 </Position22> 738 738 <Position23> 739 739 <Filename Value="UCore.pas"/> 740 <Caret Line=" 971" Column="1" TopLine="955"/>740 <Caret Line="1264" Column="1" TopLine="1240"/> 741 741 </Position23> 742 742 <Position24> 743 743 <Filename Value="UCore.pas"/> 744 <Caret Line="1 180" Column="1" TopLine="1163"/>744 <Caret Line="1261" Column="42" TopLine="1241"/> 745 745 </Position24> 746 746 <Position25> 747 <Filename Value=" Forms/UMainForm.pas"/>748 <Caret Line=" 46" Column="1" TopLine="29"/>747 <Filename Value="../../PascalClassLibrary/Generics/TemplateGenerics/Generic/GenericMatrix.inc"/> 748 <Caret Line="174" Column="1" TopLine="152"/> 749 749 </Position25> 750 750 <Position26> 751 <Filename Value=" Forms/UNewGameForm.pas"/>752 <Caret Line=" 22" Column="1" TopLine="5"/>751 <Filename Value="UCore.pas"/> 752 <Caret Line="698" Column="30" TopLine="682"/> 753 753 </Position26> 754 754 <Position27> 755 <Filename Value=" Forms/UNewGameForm.pas"/>756 <Caret Line=" 74" Column="1" TopLine="41"/>755 <Filename Value="UCore.pas"/> 756 <Caret Line="1172" Column="49" TopLine="1159"/> 757 757 </Position27> 758 758 <Position28> 759 <Filename Value=" UCore.pas"/>760 <Caret Line=" 971" Column="1" TopLine="954"/>759 <Filename Value="../../PascalClassLibrary/Generics/TemplateGenerics/Generic/GenericList.inc"/> 760 <Caret Line="132" Column="1" TopLine="115"/> 761 761 </Position28> 762 762 <Position29> 763 <Filename Value=" UCore.pas"/>764 <Caret Line=" 972" Column="1" TopLine="954"/>763 <Filename Value="Forms/UMainForm.pas"/> 764 <Caret Line="39" Column="35" TopLine="29"/> 765 765 </Position29> 766 766 <Position30> 767 767 <Filename Value="UCore.pas"/> 768 <Caret Line=" 973" Column="1" TopLine="954"/>768 <Caret Line="1326" Column="29" TopLine="1318"/> 769 769 </Position30> 770 770 </JumpHistory>
Note:
See TracChangeset
for help on using the changeset viewer.